Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev

Browse Source 
* commit '08924d007f2323b6fb57c858732d32b1083da639':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
This commit is contained in:
Michael Jurka
2012-11-06 12:44:18 -08:00
committed by Android Git Automerger
parent be2ca79abf 08924d007f
commit 3eaa876cf3
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -924,7 +924,10 @@ public class KeyguardHostView extends KeyguardViewBase {
pickIntent.putExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER, pickIntent.putExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER,
AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD); 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( pickIntent.addFlags(
Intent.FLAG_ACTIVITY_NEW_TASK Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_SINGLE_TOP | 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() { private void removeTransportFromWidgetPager() {
int page = getWidgetPosition(R.id.keyguard_transport_control); int page = getWidgetPosition(R.id.keyguard_transport_control);
if (page != -1) { if (page != -1) {