diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-09-27 13:04:00 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-09-27 13:04:00 -0700 |
| commit | eeb464ae43180624b7a45c50f643802dda56f2b0 (patch) | |
| tree | 924cca337bd6f6d626dc4f1efeee59be72404e1c /src/com/android/settings/SecuritySettings.java | |
| parent | bfb5fa9ec37d58101febd13a334707f8f7e341f5 (diff) | |
| download | packages_apps_Settings-eeb464ae43180624b7a45c50f643802dda56f2b0.tar.gz packages_apps_Settings-eeb464ae43180624b7a45c50f643802dda56f2b0.tar.bz2 packages_apps_Settings-eeb464ae43180624b7a45c50f643802dda56f2b0.zip | |
Addressing issue 7243210, can't set status widget properly
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 2af212cf2..420dcbcf7 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -482,7 +482,7 @@ public class SecuritySettings extends SettingsPreferenceFragment } private void launchPickActivityIntent(int featuresFilter, int defaultLabelId, int defaultIconId, - ComponentName defaultComponentName, String defaultTag) { + ComponentName defaultComponentName, String defaultTag, int widgetType) { // Create intent to pick widget Intent pickIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK); @@ -515,7 +515,7 @@ public class SecuritySettings extends SettingsPreferenceFragment pickIntent.putExtra(AppWidgetManager.EXTRA_CUSTOM_INFO, extraInfos); pickIntent.putExtra(AppWidgetManager.EXTRA_CUSTOM_EXTRAS, extraExtras); pickIntent.putExtra(Intent.EXTRA_INTENT, getBaseIntent()); - startActivityForResult(pickIntent, REQUEST_PICK_USER_SELECTED_APPWIDGET); + startActivityForResult(pickIntent, widgetType); } else { Log.e(TAG, "Unable to allocate an AppWidget id in lock screen"); } @@ -542,7 +542,8 @@ public class SecuritySettings extends SettingsPreferenceFragment SET_OR_CHANGE_LOCK_METHOD_REQUEST, null); } else if (KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET.equals(key)) { launchPickActivityIntent(AppWidgetProviderInfo.WIDGET_FEATURES_NONE, - R.string.widget_none, 0, new ComponentName("", ""), EXTRA_NO_WIDGET); + R.string.widget_none, 0, new ComponentName("", ""), EXTRA_NO_WIDGET, + REQUEST_PICK_USER_SELECTED_APPWIDGET); } else if (KEY_CHOOSE_LOCKSCREEN_STATUS_WIDGET.equals(key)) { int defaultIconId; ComponentName clock = new ComponentName( @@ -553,7 +554,8 @@ public class SecuritySettings extends SettingsPreferenceFragment defaultIconId = 0; } launchPickActivityIntent(AppWidgetProviderInfo.WIDGET_FEATURES_STATUS, - R.string.widget_default, defaultIconId, clock, EXTRA_DEFAULT_WIDGET); + R.string.widget_default, defaultIconId, clock, EXTRA_DEFAULT_WIDGET, + REQUEST_PICK_STATUS_APPWIDGET); } else if (KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING.equals(key)) { ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this.getActivity(), this); |