commit 9757e30dfa0ab691c4c15366568367e166071a7d
author Jim Miller <jaggies@google.com> Fri Dec 17 18:23:23 2010 -0800
committer Jim Miller <jaggies@google.com> Tue Dec 21 18:35:23 2010 -0800
tree ac779d231cbe470b852e1f7189a25908a6b595f0
parent 10fa99fe55fd9a96f92388b2e506c802c0a09ff9

Fix 3281395: Use breadcrumb area to display title for LockScreen

Change-Id: Icd631b4c70e7b9f6b9a8c24dd513aed259a22d6a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b82d931..356ba64 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -710,24 +710,33 @@
 
         <!-- Second and third-level settings -->
 
-        <activity android:name="ConfirmLockPattern"/>
 
-        <activity android:name="ConfirmLockPassword"/>>
+        <!-- Lock screen settings -->
+        <activity android:name="ConfirmLockPattern"
+            android:label="@string/lockpassword_confirm_your_pattern_header"/>
 
-        <activity android:name="ChooseLockGeneric">
+        <activity android:name="ConfirmLockPassword"
+            android:label="@string/lockpassword_confirm_your_password_header"/>>
+
+        <activity android:name="ChooseLockGeneric"
+            android:label="@string/lockpassword_choose_lock_generic_header">
             <intent-filter>
                 <action android:name="android.app.action.SET_NEW_PASSWORD" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name="ChooseLockPattern" android:exported="false"/>
+        <activity android:name="ChooseLockPattern" android:exported="false"
+            android:label="@string/lockpassword_choose_your_pattern_header"/>
 
-        <activity android:name="ChooseLockPassword" android:exported="false"/>
+        <activity android:name="ChooseLockPassword" android:exported="false"
+            android:label="@string/lockpassword_choose_your_password_header"/>
 
-        <activity android:name="ChooseLockPatternTutorial"/>
+        <activity android:name="ChooseLockPatternTutorial"
+            android:label="@string/lockpassword_choose_your_pattern_header"/>
 
-        <activity android:name="ChooseLockPatternExample"/>
+        <activity android:name="ChooseLockPatternExample"
+            android:label="@string/lockpassword_choose_your_pattern_header"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.Status"