Updated resources to comply with GAR.

  Bug: 15754001

Change-Id: I1236cd51ef20dfeeb3b09f473dbd1e9ccfeff971

diff --git a/res/drawable-hdpi/aspect_ratio_16x9_selected.png b/res/drawable-hdpi/aspect_ratio_16x9_selected.png
index 52ee769..d7071e2 100644 (file)
Binary files a/res/drawable-hdpi/aspect_ratio_16x9_selected.png and b/res/drawable-hdpi/aspect_ratio_16x9_selected.png differ

diff --git a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png
index 257b6f9..b91d933 100644 (file)
Binary files a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png differ

diff --git a/res/drawable-hdpi/aspect_ratio_4x3_selected.png b/res/drawable-hdpi/aspect_ratio_4x3_selected.png
index f6b421e..6b2b078 100644 (file)
Binary files a/res/drawable-hdpi/aspect_ratio_4x3_selected.png and b/res/drawable-hdpi/aspect_ratio_4x3_selected.png differ

diff --git a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png
index 200fa09..849bc12 100644 (file)
Binary files a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png differ

diff --git a/res/drawable-hdpi/btn_cling.9.png b/res/drawable-hdpi/btn_cling.9.png
index e98c15b..de6665d 100644 (file)
Binary files a/res/drawable-hdpi/btn_cling.9.png and b/res/drawable-hdpi/btn_cling.9.png differ

diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png
index 960e269..39d4fb6 100644 (file)
Binary files a/res/drawable-hdpi/btn_cling_pressed.9.png and b/res/drawable-hdpi/btn_cling_pressed.9.png differ

diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png
index 560152e..dce2d62 100644 (file)
Binary files a/res/drawable-hdpi/cling.9.png and b/res/drawable-hdpi/cling.9.png differ

diff --git a/res/drawable-mdpi/aspect_ratio_16x9_selected.png b/res/drawable-mdpi/aspect_ratio_16x9_selected.png
index 9857787..7ab6d93 100644 (file)
Binary files a/res/drawable-mdpi/aspect_ratio_16x9_selected.png and b/res/drawable-mdpi/aspect_ratio_16x9_selected.png differ

diff --git a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png
index e7d55d6..533d2ad 100644 (file)
Binary files a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png differ

diff --git a/res/drawable-mdpi/aspect_ratio_4x3_selected.png b/res/drawable-mdpi/aspect_ratio_4x3_selected.png
index 529935c..6f795db 100644 (file)
Binary files a/res/drawable-mdpi/aspect_ratio_4x3_selected.png and b/res/drawable-mdpi/aspect_ratio_4x3_selected.png differ

diff --git a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png
index 5e90f7d..29bfd60 100644 (file)
Binary files a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png differ

diff --git a/res/drawable-mdpi/btn_cling.9.png b/res/drawable-mdpi/btn_cling.9.png
index fa635a0..b57f3d4 100644 (file)
Binary files a/res/drawable-mdpi/btn_cling.9.png and b/res/drawable-mdpi/btn_cling.9.png differ

diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png
index cc6cfe8..05bfe50 100644 (file)
Binary files a/res/drawable-mdpi/btn_cling_pressed.9.png and b/res/drawable-mdpi/btn_cling_pressed.9.png differ

diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png
index 3390d04..5547483 100644 (file)
Binary files a/res/drawable-mdpi/cling.9.png and b/res/drawable-mdpi/cling.9.png differ

diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png
index c1c9927..218afad 100644 (file)
Binary files a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png and b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png differ

diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png
index 729764e..4d9b899 100644 (file)
Binary files a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png differ

diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png
index ccf1605..d3b117d 100644 (file)
Binary files a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png and b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png differ

diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png
index d355978..3c43025 100644 (file)
Binary files a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png differ

diff --git a/res/drawable-xhdpi/btn_cling.9.png b/res/drawable-xhdpi/btn_cling.9.png
index 577f2aa..d61c33d 100644 (file)
Binary files a/res/drawable-xhdpi/btn_cling.9.png and b/res/drawable-xhdpi/btn_cling.9.png differ

diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png
index 9f455f4..dbfdb83 100644 (file)
Binary files a/res/drawable-xhdpi/btn_cling_pressed.9.png and b/res/drawable-xhdpi/btn_cling_pressed.9.png differ

diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png
index e9e983e..7bed884 100644 (file)
Binary files a/res/drawable-xhdpi/cling.9.png and b/res/drawable-xhdpi/cling.9.png differ

diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png
index dd1673a..61449ff 100644 (file)
Binary files a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png and b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png differ

diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
index 4ced079..1e4937a 100644 (file)
Binary files a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png differ

diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png
index 92f8d55..50b6a00 100644 (file)
Binary files a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png and b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png differ

diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
index 8344ad2..a72be3d 100644 (file)
Binary files a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png differ

diff --git a/res/drawable-xxhdpi/btn_cling.9.png b/res/drawable-xxhdpi/btn_cling.9.png
index e69aee9..3f925e9 100644 (file)
Binary files a/res/drawable-xxhdpi/btn_cling.9.png and b/res/drawable-xxhdpi/btn_cling.9.png differ

diff --git a/res/drawable-xxhdpi/btn_cling_pressed.9.png b/res/drawable-xxhdpi/btn_cling_pressed.9.png
index e516299..f53b5f0 100644 (file)
Binary files a/res/drawable-xxhdpi/btn_cling_pressed.9.png and b/res/drawable-xxhdpi/btn_cling_pressed.9.png differ

diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png
index a618747..ef1aa7b 100644 (file)
Binary files a/res/drawable-xxhdpi/cling.9.png and b/res/drawable-xxhdpi/cling.9.png differ

diff --git a/res/layout/aspect_ratio_dialog_layout.xml b/res/layout/aspect_ratio_dialog_layout.xml
index 3eab743..e0fe011 100644 (file)
--- 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 2c433ae..b9f766a 100644 (file)
--- 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 3b6f768..f55d697 100644 (file)
--- 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 adce58c..b22ea22 100644 (file)
--- 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>