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

Bug 5050590: wrong title for lock screen

Browse Source 
Change-Id: Iba170a25ac56db4140ab91f4fd583c0f676b02b0
This commit is contained in:
Gilles Debunne
2011-08-23 11:01:35 -07:00
parent 778e5240ee
commit 6465054995
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -16,8 +16,6 @@
package com.android.settings; package com.android.settings;
import com.android.internal.widget.LockPatternUtils;
import android.app.Activity; import android.app.Activity;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
@@ -29,6 +27,8 @@ import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.security.KeyStore; import android.security.KeyStore;
import com.android.internal.widget.LockPatternUtils;
public class ChooseLockGeneric extends PreferenceActivity { public class ChooseLockGeneric extends PreferenceActivity {
@Override @Override

12
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -16,28 +16,22 @@
package com.android.settings; package com.android.settings;
import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.app.Fragment; import android.app.Fragment;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
/** /**
* Base class for Settings fragments, with some helper functions and dialog management. * Base class for Settings fragments, with some helper functions and dialog management.
*/ */
public class SettingsPreferenceFragment extends PreferenceFragment public class SettingsPreferenceFragment extends PreferenceFragment implements DialogCreatable {
implements DialogCreatable {
private static final String TAG = "SettingsPreferenceFragment"; private static final String TAG = "SettingsPreferenceFragment";
@@ -241,8 +235,8 @@ public class SettingsPreferenceFragment extends PreferenceFragment
Fragment caller, String fragmentClass, int requestCode, Bundle extras) { Fragment caller, String fragmentClass, int requestCode, Bundle extras) {
if (getActivity() instanceof PreferenceActivity) { if (getActivity() instanceof PreferenceActivity) {
PreferenceActivity preferenceActivity = (PreferenceActivity)getActivity(); PreferenceActivity preferenceActivity = (PreferenceActivity)getActivity();
preferenceActivity.startPreferencePanel(fragmentClass, extras, 0, null, caller, preferenceActivity.startPreferencePanel(fragmentClass, extras,
requestCode); R.string.lock_settings_picker_title, null, caller, requestCode);
return true; return true;
} else { } else {
Log.w(TAG, "Parent isn't PreferenceActivity, thus there's no way to launch the " Log.w(TAG, "Parent isn't PreferenceActivity, thus there's no way to launch the "