diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-11-05 18:56:14 -0800 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-11-05 18:56:14 -0800 |
| commit | ab3472f5946c5dc3193c29513e31be7309ece378 (patch) | |
| tree | 2462e169462e77e4ef545e0a1d86e75a14db3fa5 /src/com/android/settings | |
| parent | fd34f989608dc02b0cdfbb7012c4c824a5107ded (diff) | |
| download | packages_apps_settings-ab3472f5946c5dc3193c29513e31be7309ece378.zip packages_apps_settings-ab3472f5946c5dc3193c29513e31be7309ece378.tar.gz packages_apps_settings-ab3472f5946c5dc3193c29513e31be7309ece378.tar.bz2 | |
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/KeyguardAppWidgetPickActivity.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java index 0afc5b2..c82906e 100644 --- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java +++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java @@ -84,6 +84,7 @@ public class KeyguardAppWidgetPickActivity extends Activity private Intent mResultData; private LockPatternUtils mLockPatternUtils; private boolean mSuccess; + private Bundle mExtraConfigureOptions; @Override protected void onCreate(Bundle savedInstanceState) { @@ -101,6 +102,7 @@ public class KeyguardAppWidgetPickActivity extends Activity } else { finish(); } + mExtraConfigureOptions = intent.getBundleExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS); mGridView = (GridView) findViewById(R.id.widget_list); mAppWidgetManager = AppWidgetManager.getInstance(this); @@ -466,12 +468,8 @@ public class KeyguardAppWidgetPickActivity extends Activity setResultData(result, intent); } else { try { - Bundle options = null; - if (intent.getExtras() != null) { - options = intent.getExtras().getBundle( - AppWidgetManager.EXTRA_APPWIDGET_OPTIONS); - } - mAppWidgetManager.bindAppWidgetId(mAppWidgetId, intent.getComponent(), options); + mAppWidgetManager.bindAppWidgetId( + mAppWidgetId, intent.getComponent(), mExtraConfigureOptions); result = RESULT_OK; } catch (IllegalArgumentException e) { // This is thrown if they're already bound, or otherwise somehow |