diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-11-05 23:06:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-05 23:06:40 -0800 |
| commit | 08924d007f2323b6fb57c858732d32b1083da639 (patch) | |
| tree | e0eaca67e9bb37a6ad006c6c4fb9a36e79559c7e | |
| parent | 7dfc588a9db81a797b881aab41ac8951bebb033d (diff) | |
| parent | 0a75b94872c26efed113fea3b4104155c7a30c9c (diff) | |
| download | frameworks_base-08924d007f2323b6fb57c858732d32b1083da639.zip frameworks_base-08924d007f2323b6fb57c858732d32b1083da639.tar.gz frameworks_base-08924d007f2323b6fb57c858732d32b1083da639.tar.bz2 | |
Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index f165b61..11e600e 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -924,7 +924,10 @@ public class KeyguardHostView extends KeyguardViewBase { pickIntent.putExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER, AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD); - pickIntent.putExtra(Intent.EXTRA_INTENT, getBaseIntent()); + Bundle options = new Bundle(); + options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, + AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD); + pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS, options); pickIntent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP @@ -937,17 +940,6 @@ public class KeyguardHostView extends KeyguardViewBase { } } - private Intent getBaseIntent() { - Intent baseIntent = new Intent(Intent.ACTION_MAIN, null); - baseIntent.addCategory(Intent.CATEGORY_DEFAULT); - - Bundle options = new Bundle(); - options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, - AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD); - baseIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS, options); - return baseIntent; - } - private void removeTransportFromWidgetPager() { int page = getWidgetPosition(R.id.keyguard_transport_control); if (page != -1) { |