summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-04-22 09:22:40 -0700
committerAmith Yamasani <yamasani@google.com>2014-04-22 09:37:49 -0700
commit9690b19636de413075cf66462d0620157e5358d1 (patch)
tree3f3d4638ac08cd2885275a6d54b496cd842f1332
parent2ce2fd2085653904d243071b505cc0ab485ea64c (diff)
downloadpackages_apps_Settings-9690b19636de413075cf66462d0620157e5358d1.tar.gz
packages_apps_Settings-9690b19636de413075cf66462d0620157e5358d1.tar.bz2
packages_apps_Settings-9690b19636de413075cf66462d0620157e5358d1.zip
Temporary color change to make lock pattern screen visible
Fixes the white on white in Settings when creating or confirming a lock pattern. Change-Id: Ie4770edbabb76b984e17b84f8f1e7c991bb2316b
-rw-r--r--res/layout-land/choose_lock_pattern.xml3
-rw-r--r--res/layout-land/confirm_lock_pattern.xml3
-rw-r--r--res/layout-sw600dp-land/choose_lock_pattern.xml1
-rw-r--r--res/layout-sw600dp-land/confirm_lock_pattern.xml1
-rw-r--r--res/layout-sw600dp/choose_lock_pattern.xml1
-rw-r--r--res/layout-sw600dp/confirm_lock_pattern.xml1
-rw-r--r--res/layout/choose_lock_pattern.xml3
-rw-r--r--res/layout/confirm_lock_pattern.xml3
-rw-r--r--res/values/colors.xml2
9 files changed, 14 insertions, 4 deletions
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 6d3d6da21..1fa5938a1 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -85,7 +85,8 @@
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:background="@color/lock_pattern_background" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 87343c882..6e307b1da 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -59,7 +59,8 @@
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:background="@color/lock_pattern_background" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
index 8fa1ceee1..e0d96679e 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -46,6 +46,7 @@
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="354dip"
android:layout_height="354dip"
+ android:background="@color/lock_pattern_background"
aspect="square"/>
<View
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index b9dd27a85..a090a6f0a 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -52,6 +52,7 @@
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="354dip"
android:layout_height="354dip"
+ android:background="@color/lock_pattern_background"
aspect="square"/>
<View
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index dec82448b..773318493 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -51,6 +51,7 @@
android:layout_width="354dip"
android:layout_height="354dip"
android:layout_marginTop="80dip"
+ android:background="@color/lock_pattern_background"
aspect="square"/>
<View
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index c32422e5a..12e2b86ba 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -49,6 +49,7 @@
android:layout_width="354dip"
android:layout_height="354dip"
android:layout_marginTop="80dip"
+ android:background="@color/lock_pattern_background"
aspect="square"/>
<View
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index f932b4ebc..50f05d831 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -41,7 +41,8 @@
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:background="@color/lock_pattern_background" />
<!-- bottom line looks bad when button bar is their too, omit in this case -->
<!--View
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index bd100d42f..f11f5aee7 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -34,7 +34,8 @@
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:background="@color/lock_pattern_background" />
<View
android:background="@*android:drawable/code_lock_bottom"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fcbf46b58..acbccaacb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -46,6 +46,8 @@
<color name="circle_avatar_frame_shadow_color">#80000000</color>
<color name="circle_avatar_frame_pressed_color">#ffffffff</color>
+ <color name="lock_pattern_background">#8000</color>
+
<color name="quantum_blue_grey_50">#ffeceff1</color>
<color name="quantum_blue_grey_100">#ffcfd8dc</color>
<color name="quantum_blue_grey_300">#ff90a4ae</color>