PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]

Browse Source 
Manual merge of Change-Id: I3c53d1864e521f4245b94d39664266891a728615

Change-Id: I59eedd81af226949ac0df10390ae0642e1812c5a
This commit is contained in:
Jim Miller
2011-01-06 21:52:09 -08:00
parent 580c80f853
commit 7da8cae44b
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AndroidManifest.xml
View File

@@ -712,11 +712,9 @@
<!-- Lock screen settings --> <!-- Lock screen settings -->
<activity android:name="ConfirmLockPattern" <activity android:name="ConfirmLockPattern"/>
android:label="@string/lockpassword_confirm_your_pattern_header"/>
<activity android:name="ConfirmLockPassword" <activity android:name="ConfirmLockPassword"/>
android:label="@string/lockpassword_confirm_your_password_header"/>>
<activity android:name="ChooseLockGeneric" <activity android:name="ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header"> android:label="@string/lockpassword_choose_lock_generic_header">
@@ -726,14 +724,11 @@
</intent-filter> </intent-filter>
</activity> </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:exported="false"/>
android:label="@string/lockpassword_choose_your_pattern_header"/>
<!-- Runs in the phone process since it needs access to the Phone object --> <!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".deviceinfo.Status" <activity android:name=".deviceinfo.Status"

2
src/com/android/settings/ChooseLockPassword.java
View File

@@ -70,6 +70,8 @@ public class ChooseLockPassword extends PreferenceActivity {
//getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
//WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_choose_your_password_header);
showBreadCrumbs(msg, msg);
} }
public static class ChooseLockPasswordFragment extends Fragment public static class ChooseLockPasswordFragment extends Fragment

2
src/com/android/settings/ChooseLockPattern.java
View File

@@ -72,6 +72,8 @@ public class ChooseLockPattern extends PreferenceActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// requestWindowFeature(Window.FEATURE_NO_TITLE); // requestWindowFeature(Window.FEATURE_NO_TITLE);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
showBreadCrumbs(msg, msg);
} }
@Override @Override

7
src/com/android/settings/ChooseLockPatternTutorial.java
View File

@@ -44,6 +44,13 @@ public class ChooseLockPatternTutorial extends PreferenceActivity {
return modIntent; 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 public static class ChooseLockPatternTutorialFragment extends Fragment
implements View.OnClickListener { implements View.OnClickListener {
private View mNextButton; private View mNextButton;

2
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -53,6 +53,8 @@ public class ConfirmLockPassword extends PreferenceActivity {
//getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
//WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); //WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_confirm_your_password_header);
showBreadCrumbs(msg, msg);
} }
public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener, public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,

7
src/com/android/settings/ConfirmLockPattern.java
View File

@@ -61,6 +61,13 @@ public class ConfirmLockPattern extends PreferenceActivity {
LockedOut LockedOut
} }
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_confirm_your_pattern_header);
showBreadCrumbs(msg, msg);
}
@Override @Override
public Intent getIntent() { public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent()); Intent modIntent = new Intent(super.getIntent());