color changes for modes, onboarding screens, and tutorial screens

bug: 17785834

Change-Id: Idaf26517399a07471f2b6a98fdb9629baf41afcf

53 files changed, 17 insertions, 10 deletions

diff --git a/res/drawable-hdpi/aspect_ratio_16x9_selected.jpg b/res/drawable-hdpi/aspect_ratio_16x9_selected.jpg
new file mode 100644
index 000000000..d87fe6815
--- /dev/null
+++ b/res/drawable-hdpi/aspect_ratio_16x9_selected.jpg
diff --git a/res/drawable-hdpi/aspect_ratio_16x9_selected.png b/res/drawable-hdpi/aspect_ratio_16x9_selected.png
deleted file mode 100644
index db793627b..000000000
--- a/res/drawable-hdpi/aspect_ratio_16x9_selected.png
+++ /dev/null
diff --git a/res/drawable-hdpi/aspect_ratio_16x9_unselected.jpg b/res/drawable-hdpi/aspect_ratio_16x9_unselected.jpg
new file mode 100644
index 000000000..0f488855e
--- /dev/null
+++ b/res/drawable-hdpi/aspect_ratio_16x9_unselected.jpg
diff --git a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png
deleted file mode 100644
index 73f365985..000000000
--- a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png
+++ /dev/null
diff --git a/res/drawable-hdpi/aspect_ratio_4x3_selected.jpg b/res/drawable-hdpi/aspect_ratio_4x3_selected.jpg
new file mode 100644
index 000000000..cbb6f1050
--- /dev/null
+++ b/res/drawable-hdpi/aspect_ratio_4x3_selected.jpg
diff --git a/res/drawable-hdpi/aspect_ratio_4x3_selected.png b/res/drawable-hdpi/aspect_ratio_4x3_selected.png
deleted file mode 100644
index 87b44f530..000000000
--- a/res/drawable-hdpi/aspect_ratio_4x3_selected.png
+++ /dev/null
diff --git a/res/drawable-hdpi/aspect_ratio_4x3_unselected.jpg b/res/drawable-hdpi/aspect_ratio_4x3_unselected.jpg
new file mode 100644
index 000000000..3e477f81d
--- /dev/null
+++ b/res/drawable-hdpi/aspect_ratio_4x3_unselected.jpg
diff --git a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png
deleted file mode 100644
index 9ec9a7a59..000000000
--- a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png
+++ /dev/null
diff --git a/res/drawable-hdpi/geo_opt_in_graphic.jpg b/res/drawable-hdpi/geo_opt_in_graphic.jpg
new file mode 100644
index 000000000..c7e04b4f2
--- /dev/null
+++ b/res/drawable-hdpi/geo_opt_in_graphic.jpg
diff --git a/res/drawable-hdpi/geo_opt_in_graphic.png b/res/drawable-hdpi/geo_opt_in_graphic.png
deleted file mode 100644
index 236eaa315..000000000
--- a/res/drawable-hdpi/geo_opt_in_graphic.png
+++ /dev/null
diff --git a/res/drawable-mdpi/aspect_ratio_16x9_selected.jpg b/res/drawable-mdpi/aspect_ratio_16x9_selected.jpg
new file mode 100644
index 000000000..ed5b996fd
--- /dev/null
+++ b/res/drawable-mdpi/aspect_ratio_16x9_selected.jpg
diff --git a/res/drawable-mdpi/aspect_ratio_16x9_selected.png b/res/drawable-mdpi/aspect_ratio_16x9_selected.png
deleted file mode 100644
index 241117918..000000000
--- a/res/drawable-mdpi/aspect_ratio_16x9_selected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/aspect_ratio_16x9_unselected.jpg b/res/drawable-mdpi/aspect_ratio_16x9_unselected.jpg
new file mode 100644
index 000000000..ee5521ea3
--- /dev/null
+++ b/res/drawable-mdpi/aspect_ratio_16x9_unselected.jpg
diff --git a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png
deleted file mode 100644
index a7f3afd88..000000000
--- a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/aspect_ratio_4x3_selected.jpg b/res/drawable-mdpi/aspect_ratio_4x3_selected.jpg
new file mode 100644
index 000000000..4435bdd0e
--- /dev/null
+++ b/res/drawable-mdpi/aspect_ratio_4x3_selected.jpg
diff --git a/res/drawable-mdpi/aspect_ratio_4x3_selected.png b/res/drawable-mdpi/aspect_ratio_4x3_selected.png
deleted file mode 100644
index 47026da4f..000000000
--- a/res/drawable-mdpi/aspect_ratio_4x3_selected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/aspect_ratio_4x3_unselected.jpg b/res/drawable-mdpi/aspect_ratio_4x3_unselected.jpg
new file mode 100644
index 000000000..8c6d898f6
--- /dev/null
+++ b/res/drawable-mdpi/aspect_ratio_4x3_unselected.jpg
diff --git a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png
deleted file mode 100644
index abaeea274..000000000
--- a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png
+++ /dev/null
diff --git a/res/drawable-mdpi/geo_opt_in_graphic.jpg b/res/drawable-mdpi/geo_opt_in_graphic.jpg
new file mode 100644
index 000000000..c81900fdf
--- /dev/null
+++ b/res/drawable-mdpi/geo_opt_in_graphic.jpg
diff --git a/res/drawable-mdpi/geo_opt_in_graphic.png b/res/drawable-mdpi/geo_opt_in_graphic.png
deleted file mode 100644
index a40e32fc6..000000000
--- a/res/drawable-mdpi/geo_opt_in_graphic.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_selected.jpg b/res/drawable-xhdpi/aspect_ratio_16x9_selected.jpg
new file mode 100644
index 000000000..970d47f8b
--- /dev/null
+++ b/res/drawable-xhdpi/aspect_ratio_16x9_selected.jpg
diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png
deleted file mode 100644
index c05aef5fe..000000000
--- a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.jpg b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.jpg
new file mode 100644
index 000000000..d9d932341
--- /dev/null
+++ b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.jpg
diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png
deleted file mode 100644
index db606f323..000000000
--- a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_selected.jpg b/res/drawable-xhdpi/aspect_ratio_4x3_selected.jpg
new file mode 100644
index 000000000..0a8927086
--- /dev/null
+++ b/res/drawable-xhdpi/aspect_ratio_4x3_selected.jpg
diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png
deleted file mode 100644
index 45df82ec3..000000000
--- a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.jpg b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.jpg
new file mode 100644
index 000000000..359e2fde1
--- /dev/null
+++ b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.jpg
diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png
deleted file mode 100644
index 460d5a8ae..000000000
--- a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/geo_opt_in_graphic.jpg b/res/drawable-xhdpi/geo_opt_in_graphic.jpg
new file mode 100644
index 000000000..bfc6880ee
--- /dev/null
+++ b/res/drawable-xhdpi/geo_opt_in_graphic.jpg
diff --git a/res/drawable-xhdpi/geo_opt_in_graphic.png b/res/drawable-xhdpi/geo_opt_in_graphic.png
deleted file mode 100644
index a51d1513f..000000000
--- a/res/drawable-xhdpi/geo_opt_in_graphic.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.jpg b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.jpg
new file mode 100644
index 000000000..fbeb39ec3
--- /dev/null
+++ b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.jpg
diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png
deleted file mode 100644
index 66c85b59c..000000000
--- a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.jpg b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.jpg
new file mode 100644
index 000000000..acfb95c33
--- /dev/null
+++ b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.jpg
diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
deleted file mode 100644
index 27024fc17..000000000
--- a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.jpg b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.jpg
new file mode 100644
index 000000000..f34276f52
--- /dev/null
+++ b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.jpg
diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png
deleted file mode 100644
index 47ee93028..000000000
--- a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.jpg b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.jpg
new file mode 100644
index 000000000..861ce032f
--- /dev/null
+++ b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.jpg
diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
deleted file mode 100644
index d758eb996..000000000
--- a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/geo_opt_in_graphic.jpg b/res/drawable-xxhdpi/geo_opt_in_graphic.jpg
new file mode 100644
index 000000000..7de7edeed
--- /dev/null
+++ b/res/drawable-xxhdpi/geo_opt_in_graphic.jpg
diff --git a/res/drawable-xxhdpi/geo_opt_in_graphic.png b/res/drawable-xxhdpi/geo_opt_in_graphic.png
deleted file mode 100644
index 8f29861d1..000000000
--- a/res/drawable-xxhdpi/geo_opt_in_graphic.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.jpg b/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.jpg
new file mode 100644
index 000000000..be2f8eb24
--- /dev/null
+++ b/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.jpg
diff --git a/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png
deleted file mode 100644
index 6b1dfa8bf..000000000
--- a/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.jpg b/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.jpg
new file mode 100644
index 000000000..8ec28675f
--- /dev/null
+++ b/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.jpg
diff --git a/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png
deleted file mode 100644
index 4d9235b4d..000000000
--- a/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.jpg b/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.jpg
new file mode 100644
index 000000000..f6073eaa7
--- /dev/null
+++ b/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.jpg
diff --git a/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png
deleted file mode 100644
index a3bfeff5e..000000000
--- a/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.jpg b/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.jpg
new file mode 100644
index 000000000..cd405c26f
--- /dev/null
+++ b/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.jpg
diff --git a/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png
deleted file mode 100644
index 7e343e2fd..000000000
--- a/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png
+++ /dev/null
diff --git a/res/drawable-xxxhdpi/geo_opt_in_graphic.jpg b/res/drawable-xxxhdpi/geo_opt_in_graphic.jpg
new file mode 100644
index 000000000..710816110
--- /dev/null
+++ b/res/drawable-xxxhdpi/geo_opt_in_graphic.jpg
diff --git a/res/drawable-xxxhdpi/geo_opt_in_graphic.png b/res/drawable-xxxhdpi/geo_opt_in_graphic.png
deleted file mode 100644
index 63b47738b..000000000
--- a/res/drawable-xxxhdpi/geo_opt_in_graphic.png
+++ /dev/null
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index cdaff13e3..dd385aebc 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -34,8 +34,9 @@
         <item name="android:backgroundStacked">@null</item>
     </style>
 
-    <style name="Theme.CameraSettings" parent="@android:style/Theme.Material">
-       <item name="android:windowFullscreen">true</item>
+    <style name="Theme.CameraSettings" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:colorPrimary">@color/main_color_global</item>
     </style>
 
     <style name="FilmstripBottomControlButton">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 474809989..3d29d5a71 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -82,12 +82,13 @@
     <color name="mode_list_settings_icon_background">#26000000</color>
     <color name="mode_list_settings_icon_pressed_background">#99000000</color>
 
-    <color name="camera_mode_color">#2979ff</color>
-    <color name="video_mode_color">#dd2c00</color>
-    <color name="refocus_mode_color">#00c853</color>
-    <color name="photosphere_mode_color">#aa00ff</color>
-    <color name="panorama_mode_color">#ffbc00</color>
+    <color name="camera_mode_color">#4285f4</color>
+    <color name="video_mode_color">#db4437</color>
+    <color name="refocus_mode_color">#0f9d58</color>
+    <color name="photosphere_mode_color">#ab47bc</color>
+    <color name="panorama_mode_color">#ff9e00</color>
     <color name="mode_cover_default_color">#191919</color>
+    <color name="main_color_global">#00acc1</color>
 
     <color name="bottombar_unpressed">#191919</color>
     <color name="bottombar_pressed">#262626</color>
@@ -99,7 +100,7 @@
 
     <color name="grid_line">#33FFFFFF</color>
     <color name="focus_outer_ring_color">#4CFFFFFF</color>
-    <color name="fullscreen_dialog_background_color">#FFFDD835</color>
+    <color name="fullscreen_dialog_background_color">@color/main_color_global</color>
     <color name="dialog_button_color">#FF76A7F9</color>
     <color name="dialog_text_color">#DF000000</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fd6baea11..ec1e7e0b6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
     <!-- Camera resources below -->
     <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar">
     </style>
@@ -204,9 +204,14 @@
       <item name="android:layout_margin">6dp</item>
       <item name="android:background">@null</item>
     </style>
-    <style name="Theme.CameraSettings" parent="@android:style/Theme.Holo">
+    <style name="Theme.CameraSettings" parent="@android:style/Theme.Holo.Light.DarkActionBar">
        <item name="android:windowFullscreen">true</item>
+       <item name="android:actionBarStyle">@style/Settings.ActionBar</item>
     </style>
+    <style name="Settings.ActionBar" parent="android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+        <item name="android:background">@color/main_color_global</item>
+    </style>
+
     <style name="start_up_dialog_content">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>