summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockPassword.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-12-17 18:23:23 -0800
committerJim Miller <jaggies@google.com>2010-12-21 18:35:23 -0800
commit9757e30dfa0ab691c4c15366568367e166071a7d (patch)
treeac779d231cbe470b852e1f7189a25908a6b595f0 /src/com/android/settings/ChooseLockPassword.java
parent10fa99fe55fd9a96f92388b2e506c802c0a09ff9 (diff)
downloadpackages_apps_Settings-9757e30dfa0ab691c4c15366568367e166071a7d.zip
packages_apps_Settings-9757e30dfa0ab691c4c15366568367e166071a7d.tar.gz
packages_apps_Settings-9757e30dfa0ab691c4c15366568367e166071a7d.tar.bz2
Fix 3281395: Use breadcrumb area to display title for LockScreen
Change-Id: Icd631b4c70e7b9f6b9a8c24dd513aed259a22d6a
Diffstat (limited to 'src/com/android/settings/ChooseLockPassword.java')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index a37d3da..98bd019 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -183,7 +183,8 @@ public class ChooseLockPassword extends PreferenceActivity {
mPasswordEntry.setOnEditorActionListener(this);
mPasswordEntry.addTextChangedListener(this);
- mKeyboardHelper = new PasswordEntryKeyboardHelper(getActivity(),
+ final Activity activity = getActivity();
+ mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
mKeyboardView, mPasswordEntry);
mKeyboardHelper.setKeyboardMode(mIsAlphaMode ?
PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
@@ -212,6 +213,14 @@ public class ChooseLockPassword extends PreferenceActivity {
updateStage(mUiStage);
}
}
+ // Update the breadcrumb (title) if this is embedded in a PreferenceActivity
+ if (activity instanceof PreferenceActivity) {
+ final PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+ int id = mIsAlphaMode ? R.string.lockpassword_confirm_your_password_header
+ : R.string.lockpassword_confirm_your_pin_header;
+ CharSequence title = getText(id);
+ preferenceActivity.showBreadCrumbs(title, title);
+ }
return view;
}