diff options
| author | Jim Miller <jaggies@google.com> | 2011-01-06 21:52:09 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-01-07 13:37:30 -0800 |
| commit | 8c74072e9cad7ae7cf7266f87b8f202aa42939ce (patch) | |
| tree | b2e475510aa3541cfbb3f267663522d321fd47dd /src/com/android | |
| parent | 6986495bcb06f30ab6be99228032c06597bbd711 (diff) | |
| download | packages_apps_Settings-8c74072e9cad7ae7cf7266f87b8f202aa42939ce.tar.gz packages_apps_Settings-8c74072e9cad7ae7cf7266f87b8f202aa42939ce.tar.bz2 packages_apps_Settings-8c74072e9cad7ae7cf7266f87b8f202aa42939ce.zip | |
Fix 3281395: Fix duplicate title in LockScreen Settings.
Change-Id: I3c53d1864e521f4245b94d39664266891a728615
Diffstat (limited to 'src/com/android')
5 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index 98bd0196e..b8db82e24 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -70,6 +70,8 @@ public class ChooseLockPassword extends PreferenceActivity { //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); super.onCreate(savedInstanceState); + CharSequence msg = getText(R.string.lockpassword_choose_your_password_header); + showBreadCrumbs(msg, msg); } public static class ChooseLockPasswordFragment extends Fragment diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 748b44410..17d3de24b 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -72,6 +72,8 @@ public class ChooseLockPattern extends PreferenceActivity { public void onCreate(Bundle savedInstanceState) { // requestWindowFeature(Window.FEATURE_NO_TITLE); super.onCreate(savedInstanceState); + CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header); + showBreadCrumbs(msg, msg); } @Override diff --git a/src/com/android/settings/ChooseLockPatternTutorial.java b/src/com/android/settings/ChooseLockPatternTutorial.java index a96baa23a..2e596dfb7 100644 --- a/src/com/android/settings/ChooseLockPatternTutorial.java +++ b/src/com/android/settings/ChooseLockPatternTutorial.java @@ -44,6 +44,13 @@ public class ChooseLockPatternTutorial extends PreferenceActivity { return modIntent; } + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header); + showBreadCrumbs(msg, msg); + } + public static class ChooseLockPatternTutorialFragment extends Fragment implements View.OnClickListener { private View mNextButton; diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index 08e99ea6e..5447ba8fc 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -53,6 +53,8 @@ public class ConfirmLockPassword extends PreferenceActivity { //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); super.onCreate(savedInstanceState); + CharSequence msg = getText(R.string.lockpassword_confirm_your_password_header); + showBreadCrumbs(msg, msg); } public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener, diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index 25e8370f4..0653d3f7a 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -62,6 +62,13 @@ public class ConfirmLockPattern extends PreferenceActivity { } @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + CharSequence msg = getText(R.string.lockpassword_confirm_your_pattern_header); + showBreadCrumbs(msg, msg); + } + + @Override public Intent getIntent() { Intent modIntent = new Intent(super.getIntent()); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ConfirmLockPatternFragment.class.getName()); |