Updated resources to comply with GAR.

  Bug: 15754001

Change-Id: I1236cd51ef20dfeeb3b09f473dbd1e9ccfeff971

32 files changed, 5 insertions, 5 deletions

diff --git a/res/drawable-hdpi/aspect_ratio_16x9_selected.png b/res/drawable-hdpi/aspect_ratio_16x9_selected.png
index 52ee76990..d7071e2a7 100644
--- a/res/drawable-hdpi/aspect_ratio_16x9_selected.png
+++ b/res/drawable-hdpi/aspect_ratio_16x9_selected.png
diff --git a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png
index 257b6f941..b91d93305 100644
--- a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png
+++ b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png
diff --git a/res/drawable-hdpi/aspect_ratio_4x3_selected.png b/res/drawable-hdpi/aspect_ratio_4x3_selected.png
index f6b421e08..6b2b0781b 100644
--- a/res/drawable-hdpi/aspect_ratio_4x3_selected.png
+++ b/res/drawable-hdpi/aspect_ratio_4x3_selected.png
diff --git a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png
index 200fa098d..849bc12c3 100644
--- a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png
+++ b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png
diff --git a/res/drawable-hdpi/btn_cling.9.png b/res/drawable-hdpi/btn_cling.9.png
index e98c15b6d..de6665de7 100644
--- a/res/drawable-hdpi/btn_cling.9.png
+++ b/res/drawable-hdpi/btn_cling.9.png
diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png
index 960e269b2..39d4fb660 100644
--- a/res/drawable-hdpi/btn_cling_pressed.9.png
+++ b/res/drawable-hdpi/btn_cling_pressed.9.png
diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png
index 560152e21..dce2d6219 100644
--- a/res/drawable-hdpi/cling.9.png
+++ b/res/drawable-hdpi/cling.9.png
diff --git a/res/drawable-mdpi/aspect_ratio_16x9_selected.png b/res/drawable-mdpi/aspect_ratio_16x9_selected.png
index 9857787be..7ab6d93df 100644
--- a/res/drawable-mdpi/aspect_ratio_16x9_selected.png
+++ b/res/drawable-mdpi/aspect_ratio_16x9_selected.png
diff --git a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png
index e7d55d6fc..533d2ad7e 100644
--- a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png
+++ b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png
diff --git a/res/drawable-mdpi/aspect_ratio_4x3_selected.png b/res/drawable-mdpi/aspect_ratio_4x3_selected.png
index 529935cfc..6f795db9b 100644
--- a/res/drawable-mdpi/aspect_ratio_4x3_selected.png
+++ b/res/drawable-mdpi/aspect_ratio_4x3_selected.png
diff --git a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png
index 5e90f7d54..29bfd60fc 100644
--- a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png
+++ b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png
diff --git a/res/drawable-mdpi/btn_cling.9.png b/res/drawable-mdpi/btn_cling.9.png
index fa635a0b3..b57f3d498 100644
--- a/res/drawable-mdpi/btn_cling.9.png
+++ b/res/drawable-mdpi/btn_cling.9.png
diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png
index cc6cfe83a..05bfe5032 100644
--- a/res/drawable-mdpi/btn_cling_pressed.9.png
+++ b/res/drawable-mdpi/btn_cling_pressed.9.png
diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png
index 3390d042d..554748313 100644
--- a/res/drawable-mdpi/cling.9.png
+++ b/res/drawable-mdpi/cling.9.png
diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png
index c1c992703..218afad0c 100644
--- a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png
+++ b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png
diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png
index 729764e27..4d9b8991a 100644
--- a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png
+++ b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png
diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png
index ccf1605f8..d3b117d61 100644
--- a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png
+++ b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png
diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png
index d35597837..3c43025ad 100644
--- a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png
+++ b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png
diff --git a/res/drawable-xhdpi/btn_cling.9.png b/res/drawable-xhdpi/btn_cling.9.png
index 577f2aa1e..d61c33d3d 100644
--- a/res/drawable-xhdpi/btn_cling.9.png
+++ b/res/drawable-xhdpi/btn_cling.9.png
diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png
index 9f455f41b..dbfdb83da 100644
--- a/res/drawable-xhdpi/btn_cling_pressed.9.png
+++ b/res/drawable-xhdpi/btn_cling_pressed.9.png
diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png
index e9e983e22..7bed884dd 100644
--- a/res/drawable-xhdpi/cling.9.png
+++ b/res/drawable-xhdpi/cling.9.png
diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png
index dd1673a3b..61449ffe4 100644
--- a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png
+++ b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png
diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
index 4ced079ae..1e4937a5e 100644
--- a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
+++ b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png
index 92f8d550b..50b6a007e 100644
--- a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png
+++ b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png
diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
index 8344ad279..a72be3d83 100644
--- a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
+++ b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
diff --git a/res/drawable-xxhdpi/btn_cling.9.png b/res/drawable-xxhdpi/btn_cling.9.png
index e69aee9c7..3f925e9e3 100644
--- a/res/drawable-xxhdpi/btn_cling.9.png
+++ b/res/drawable-xxhdpi/btn_cling.9.png
diff --git a/res/drawable-xxhdpi/btn_cling_pressed.9.png b/res/drawable-xxhdpi/btn_cling_pressed.9.png
index e51629938..f53b5f095 100644
--- a/res/drawable-xxhdpi/btn_cling_pressed.9.png
+++ b/res/drawable-xxhdpi/btn_cling_pressed.9.png
diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png
index a618747fd..ef1aa7b0e 100644
--- a/res/drawable-xxhdpi/cling.9.png
+++ b/res/drawable-xxhdpi/cling.9.png
diff --git a/res/layout/aspect_ratio_dialog_layout.xml b/res/layout/aspect_ratio_dialog_layout.xml
index 3eab743a5..e0fe01144 100644
--- a/res/layout/aspect_ratio_dialog_layout.xml
+++ b/res/layout/aspect_ratio_dialog_layout.xml
@@ -18,6 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/start_up_dialog_background_color">
+    android:background="@color/fullscreen_dialog_background_color">
     <include layout="@layout/aspect_ratio_dialog_content" />
 </com.android.camera.widget.AspectRatioDialogLayout>
\ No newline at end of file
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 2c433aea8..b9f766a48 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -60,7 +60,7 @@
         android:id="@+id/tutorials_placeholder_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#DEDEDE"
+        android:background="@color/fullscreen_dialog_background_color"
         android:visibility="gone"
         android:clickable="true" >
     </FrameLayout>
diff --git a/res/layout/location_dialog_layout.xml b/res/layout/location_dialog_layout.xml
index 3b6f7682c..f55d697a1 100644
--- a/res/layout/location_dialog_layout.xml
+++ b/res/layout/location_dialog_layout.xml
@@ -18,6 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             android:background="@color/start_up_dialog_background_color">
+             android:background="@color/fullscreen_dialog_background_color">
     <include layout="@layout/location_dialog_content"/>
 </com.android.camera.widget.LocationDialogLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index adce58c3a..b22ea226a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -99,9 +99,9 @@
 
     <color name="grid_line">#33FFFFFF</color>
     <color name="focus_outer_ring_color">#4CFFFFFF</color>
-    <color name="start_up_dialog_background_color">#D6D6D6</color>
+    <color name="fullscreen_dialog_background_color">#F5F5F5</color>
     <color name="dialog_button_color">#FF76A7F9</color>
     <color name="dialog_text_color">#6D6D6D</color>
 
-    <color name="settings_cling_color">#FF76A7F9</color>
+    <color name="settings_cling_color">#3367D6</color>
 </resources>