diff options
Diffstat (limited to 'src/com/android/settings')
4 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java index 266621f..d64a092 100644 --- a/src/com/android/settings/AccessibilitySettings.java +++ b/src/com/android/settings/AccessibilitySettings.java @@ -282,7 +282,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras(); extras.putString(EXTRA_TITLE, getString( R.string.accessibility_screen_magnification_title)); - extras.putString(EXTRA_SUMMARY, getString( + extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText( R.string.accessibility_screen_magnification_summary)); extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1); @@ -1005,7 +1005,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements getActivity().getActionBar().setTitle(title); } // Summary. - String summary = arguments.getString(EXTRA_SUMMARY); + CharSequence summary = arguments.getCharSequence(EXTRA_SUMMARY); mSummaryPreference.setSummary(summary); } } diff --git a/src/com/android/settings/AppWidgetPickActivity.java b/src/com/android/settings/AppWidgetPickActivity.java index 97f816a..953d10c 100644 --- a/src/com/android/settings/AppWidgetPickActivity.java +++ b/src/com/android/settings/AppWidgetPickActivity.java @@ -269,7 +269,7 @@ public class AppWidgetPickActivity extends ActivityPicker { // If not specified, we don't filter on any specific int featuresFilter = AppWidgetProviderInfo.WIDGET_FEATURES_NONE; if (intent.getExtras().containsKey(AppWidgetManager.EXTRA_FEATURES_FILTER)) { - featuresFilter = intent.getExtras().getInt(AppWidgetManager.EXTRA_CATEGORY_FILTER); + featuresFilter = intent.getExtras().getInt(AppWidgetManager.EXTRA_FEATURES_FILTER); } putInstalledAppWidgets(items, categoryFilter, featuresFilter); diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java index 1272ddc..0afa4d5 100644 --- a/src/com/android/settings/LocalePicker.java +++ b/src/com/android/settings/LocalePicker.java @@ -17,9 +17,7 @@ package com.android.settings; import android.app.Dialog; -import android.content.Context; import android.os.Bundle; -import android.os.UserManager; import android.util.Log; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; @@ -78,11 +76,12 @@ public class LocalePicker extends com.android.internal.app.LocalePicker mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId)); } - public Dialog onCreateDialog(int dialogId) { + public Dialog onCreateDialog(final int dialogId) { return Utils.buildGlobalChangeWarningDialog(getActivity(), R.string.global_locale_change_title, new Runnable() { public void run() { + removeDialog(dialogId); getActivity().onBackPressed(); LocalePicker.updateLocale(mTargetLocale); } diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 7690b7e..1cdb4dc 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -464,7 +464,7 @@ public class InstalledAppDetails extends Fragment showIt = false; } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { showIt = false; - } else if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { + } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { showIt = false; } else if (UserHandle.myUserId() != 0) { showIt = false; |