summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-01-11 13:50:40 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-11 13:50:40 -0800
commit7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e (patch)
tree5dafb93f9b858f464b8a201b2b70b70878534c3f /src
parent31a071432ee036c828b8df67a6d33f438d7efe5f (diff)
parentd75905991c5a1783ca27dc188c2d086f8f13ff94 (diff)
downloadpackages_apps_Settings-7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e.zip
packages_apps_Settings-7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e.tar.gz
packages_apps_Settings-7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e.tar.bz2
Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b8db82e..1bebebb 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -218,8 +218,8 @@ public class ChooseLockPassword extends PreferenceActivity {
// 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;
+ int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
+ : R.string.lockpassword_choose_your_pin_header;
CharSequence title = getText(id);
preferenceActivity.showBreadCrumbs(title, title);
}