new colors for GAR contrast compliance
Change-Id: I2e1a05b9670c01c9729ed9e7b8b146add95ab88f
diff --git a/res/drawable-hdpi/btn_cling.9.png b/res/drawable-hdpi/btn_cling.9.png
index 5501632..96b7183 100644
--- a/res/drawable-hdpi/btn_cling.9.png
+++ b/res/drawable-hdpi/btn_cling.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_cling_pressed.9.png b/res/drawable-hdpi/btn_cling_pressed.9.png
index e9ae75b..a81a776 100644
--- a/res/drawable-hdpi/btn_cling_pressed.9.png
+++ b/res/drawable-hdpi/btn_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/stgs_cling.9.png b/res/drawable-hdpi/stgs_cling.9.png
new file mode 100644
index 0000000..5501632
--- /dev/null
+++ b/res/drawable-hdpi/stgs_cling.9.png
Binary files differ
diff --git a/res/drawable-hdpi/stgs_cling_pressed.9.png b/res/drawable-hdpi/stgs_cling_pressed.9.png
new file mode 100644
index 0000000..e9ae75b
--- /dev/null
+++ b/res/drawable-hdpi/stgs_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_cling.9.png b/res/drawable-mdpi/btn_cling.9.png
index b93d042..47355c0 100644
--- a/res/drawable-mdpi/btn_cling.9.png
+++ b/res/drawable-mdpi/btn_cling.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_cling_pressed.9.png b/res/drawable-mdpi/btn_cling_pressed.9.png
index f6e370b..dee7b22 100644
--- a/res/drawable-mdpi/btn_cling_pressed.9.png
+++ b/res/drawable-mdpi/btn_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/stgs_cling.9.png b/res/drawable-mdpi/stgs_cling.9.png
new file mode 100644
index 0000000..b93d042
--- /dev/null
+++ b/res/drawable-mdpi/stgs_cling.9.png
Binary files differ
diff --git a/res/drawable-mdpi/stgs_cling_pressed.9.png b/res/drawable-mdpi/stgs_cling_pressed.9.png
new file mode 100644
index 0000000..f6e370b
--- /dev/null
+++ b/res/drawable-mdpi/stgs_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_cling.9.png b/res/drawable-xhdpi/btn_cling.9.png
index cce70b3..e4e3252 100644
--- a/res/drawable-xhdpi/btn_cling.9.png
+++ b/res/drawable-xhdpi/btn_cling.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_cling_pressed.9.png b/res/drawable-xhdpi/btn_cling_pressed.9.png
index efa0f1c..83fd9ca 100644
--- a/res/drawable-xhdpi/btn_cling_pressed.9.png
+++ b/res/drawable-xhdpi/btn_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/stgs_cling.9.png b/res/drawable-xhdpi/stgs_cling.9.png
new file mode 100644
index 0000000..cce70b3
--- /dev/null
+++ b/res/drawable-xhdpi/stgs_cling.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/stgs_cling_pressed.9.png b/res/drawable-xhdpi/stgs_cling_pressed.9.png
new file mode 100644
index 0000000..efa0f1c
--- /dev/null
+++ b/res/drawable-xhdpi/stgs_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_cling.9.png b/res/drawable-xxhdpi/btn_cling.9.png
index ba016b2..b41788c 100644
--- a/res/drawable-xxhdpi/btn_cling.9.png
+++ b/res/drawable-xxhdpi/btn_cling.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/btn_cling_pressed.9.png b/res/drawable-xxhdpi/btn_cling_pressed.9.png
index 48e861a..3a95c15 100644
--- a/res/drawable-xxhdpi/btn_cling_pressed.9.png
+++ b/res/drawable-xxhdpi/btn_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/stgs_cling.9.png b/res/drawable-xxhdpi/stgs_cling.9.png
new file mode 100644
index 0000000..ba016b2
--- /dev/null
+++ b/res/drawable-xxhdpi/stgs_cling.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/stgs_cling_pressed.9.png b/res/drawable-xxhdpi/stgs_cling_pressed.9.png
new file mode 100644
index 0000000..48e861a
--- /dev/null
+++ b/res/drawable-xxhdpi/stgs_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/btn_cling.9.png b/res/drawable-xxxhdpi/btn_cling.9.png
new file mode 100644
index 0000000..1400b86
--- /dev/null
+++ b/res/drawable-xxxhdpi/btn_cling.9.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/btn_cling_pressed.9.png b/res/drawable-xxxhdpi/btn_cling_pressed.9.png
new file mode 100644
index 0000000..a6bcb12
--- /dev/null
+++ b/res/drawable-xxxhdpi/btn_cling_pressed.9.png
Binary files differ
diff --git a/res/drawable/settings_cling.xml b/res/drawable/settings_cling.xml
new file mode 100644
index 0000000..9d04a08
--- /dev/null
+++ b/res/drawable/settings_cling.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/stgs_cling_pressed" />
+ <item android:drawable="@drawable/stgs_cling" />
+</selector>
diff --git a/res/layout-land/location_dialog_content.xml b/res/layout-land/location_dialog_content.xml
index 07f00ee..2577f69 100644
--- a/res/layout-land/location_dialog_content.xml
+++ b/res/layout-land/location_dialog_content.xml
@@ -61,7 +61,8 @@
android:paddingRight="10dp"
android:text="@string/remember_location_prompt"
android:textColor="@color/dialog_text_color"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:lineSpacingExtra="1.9sp" />
<Button
android:id="@+id/confirm_button"
style="@style/BlueButton"
diff --git a/res/layout-port/location_dialog_content.xml b/res/layout-port/location_dialog_content.xml
index caf7792..0e1e453 100644
--- a/res/layout-port/location_dialog_content.xml
+++ b/res/layout-port/location_dialog_content.xml
@@ -46,7 +46,8 @@
android:paddingRight="10dp"
android:text="@string/remember_location_prompt"
android:textColor="@color/dialog_text_color"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ android:lineSpacingExtra="1.9sp" />
</LinearLayout>
<Button
diff --git a/res/layout/settings_cling.xml b/res/layout/settings_cling.xml
index 406a016..eaeb7c7 100644
--- a/res/layout/settings_cling.xml
+++ b/res/layout/settings_cling.xml
@@ -25,7 +25,7 @@
android:layout_width="@dimen/settings_cling_width"
android:layout_height="wrap_content"
android:text="@string/settings_cling_text"
- android:background="@drawable/btn_cling"
+ android:background="@drawable/settings_cling"
android:textColor="@android:color/white"
android:layout_gravity="top|left"/>
</com.android.camera.widget.SettingsCling>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0e5a9e5..2eee2ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -102,9 +102,11 @@
<color name="focus_outer_ring_color">#4CFFFFFF</color>
<color name="fullscreen_dialog_background_color">@color/main_color_global</color>
<color name="dialog_button_color">#FF76A7F9</color>
- <color name="dialog_text_color">@android:color/white</color>
+ <color name="dialog_text_color">@android:color/black</color>
<color name="settings_cling_color">#2962FF</color>
<color name="mode_icon_hover_highlight">#2DFFFFFF</color>
+
+ <color name="blue_button_text_color">#00838F</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ec1e7e0..ad38594 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -221,7 +221,7 @@
<item name="android:layout_height">48dp</item>
<item name="android:background">@drawable/button_cling</item>
<item name="android:fontFamily">sans-serif-regular</item>
- <item name="android:textColor">@android:color/white</item>
+ <item name="android:textColor">@color/blue_button_text_color</item>
<item name="android:textSize">14sp</item>
<item name="android:padding">12dp</item>
</style>
