diff options
| author | Jim Miller <jaggies@google.com> | 2011-08-07 16:06:13 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-08-07 16:09:50 -0700 |
| commit | 63cf89a49a751c49bf60b9898e7d59f02b91c046 (patch) | |
| tree | f0b8933a2e91b95f47ae82dc2f53c95e2cd86cc8 | |
| parent | 373bda01374cf8bad8c763236bdb87a0f2292a7b (diff) | |
| download | packages_apps_settings-63cf89a49a751c49bf60b9898e7d59f02b91c046.zip packages_apps_settings-63cf89a49a751c49bf60b9898e7d59f02b91c046.tar.gz packages_apps_settings-63cf89a49a751c49bf60b9898e7d59f02b91c046.tar.bz2 | |
Fix 5044847: Minor tweaks to SecuritySettings.
Fix for 5044847 removes "Press menu for help" which is no longer used on any device.
Fix for 5092312 removes black background from pattern/pin/password settings.
Change-Id: I849ea0296aa9f0e9ace65086f9b154a961959f00
| -rw-r--r-- | res/layout/choose_lock_password.xml | 1 | ||||
| -rw-r--r-- | res/layout/choose_lock_pattern.xml | 3 | ||||
| -rw-r--r-- | res/layout/confirm_lock_pattern.xml | 3 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index 958cc16..cb817c5 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -20,7 +20,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:background="@android:color/background_dark" android:gravity="center_horizontal"> <!-- header text ('Enter Pin') --> diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml index a356315..f932b4e 100644 --- a/res/layout/choose_lock_pattern.xml +++ b/res/layout/choose_lock_pattern.xml @@ -18,8 +18,7 @@ android:id="@+id/topLayout" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="@color/black"> + android:layout_height="match_parent"> <!-- takes up all space above button bar at bottom --> <LinearLayout diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml index 5c6d812..bd100d4 100644 --- a/res/layout/confirm_lock_pattern.xml +++ b/res/layout/confirm_lock_pattern.xml @@ -18,8 +18,7 @@ android:id="@+id/topLayout" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="@color/black"> + android:layout_height="match_parent"> <TextView android:id="@+id/headerText" android:layout_width="match_parent" diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 55f6254..9a34f2f 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -235,7 +235,7 @@ public class ChooseLockPattern extends PreferenceActivity { Introduction( R.string.lockpattern_recording_intro_header, LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled, - R.string.lockpattern_recording_intro_footer, true), + ID_EMPTY_MESSAGE, true), HelpScreen( R.string.lockpattern_settings_help_how_to_record, LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false), |