From 7da8cae44b622518fbffd6d265f291c39e9fc722 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Thu, 6 Jan 2011 21:52:09 -0800
Subject: [PATCH] Fix 3281395: Fix duplicate title in LockScreen Settings. [DO
 NOT MERGE]

Manual merge of Change-Id: I3c53d1864e521f4245b94d39664266891a728615

Change-Id: I59eedd81af226949ac0df10390ae0642e1812c5a
---
 AndroidManifest.xml                               | 15 +++++----------
 src/com/android/settings/ChooseLockPassword.java  |  2 ++
 src/com/android/settings/ChooseLockPattern.java   |  2 ++
 .../settings/ChooseLockPatternTutorial.java       |  7 +++++++
 src/com/android/settings/ConfirmLockPassword.java |  2 ++
 src/com/android/settings/ConfirmLockPattern.java  |  7 +++++++
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a94258ea282..26181829a3d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -712,11 +712,9 @@
 
 
         <!-- Lock screen settings -->
-        <activity android:name="ConfirmLockPattern"
-            android:label="@string/lockpassword_confirm_your_pattern_header"/>
+        <activity android:name="ConfirmLockPattern"/>
 
-        <activity android:name="ConfirmLockPassword"
-            android:label="@string/lockpassword_confirm_your_password_header"/>>
+        <activity android:name="ConfirmLockPassword"/>
 
         <activity android:name="ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header">
@@ -726,14 +724,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ChooseLockPattern" android:exported="false"
-            android:label="@string/lockpassword_choose_your_pattern_header"/>
+        <activity android:name="ChooseLockPattern" android:exported="false"/>
 
-        <activity android:name="ChooseLockPassword" android:exported="false"
-            android:label="@string/lockpassword_choose_your_password_header"/>
+        <activity android:name="ChooseLockPassword" android:exported="false"/>
 
-        <activity android:name="ChooseLockPatternTutorial"
-            android:label="@string/lockpassword_choose_your_pattern_header"/>
+        <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.Status"
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 98bd0196e85..b8db82e24f4 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 748b4441038..17d3de24b7f 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 a96baa23a04..2e596dfb7f3 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 08e99ea6e4b..5447ba8fc4b 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 25e8370f463..0653d3f7ab1 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -61,6 +61,13 @@ public class ConfirmLockPattern extends PreferenceActivity {
         LockedOut
     }
 
+    @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());