diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-14 19:23:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-14 19:23:57 +0000 |
commit | d21f9404da5c8cdc959b483a40876b02ced35e43 (patch) | |
tree | e56043df373b48f544b54408025553cb8dccc74e /src/com/android/launcher3/LauncherModel.java | |
parent | d468ee90911bee4d83e119500b52df1984107411 (diff) | |
parent | 84b4adc3fb2301466468828ccbd742209619e597 (diff) | |
download | android_packages_apps_Trebuchet-d21f9404da5c8cdc959b483a40876b02ced35e43.tar.gz android_packages_apps_Trebuchet-d21f9404da5c8cdc959b483a40876b02ced35e43.tar.bz2 android_packages_apps_Trebuchet-d21f9404da5c8cdc959b483a40876b02ced35e43.zip |
Merge "Disabling auto restore of widgets. > Always show "Setup" button for a widget which has a config activity." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 397db6dc2..27486822a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2195,7 +2195,7 @@ public class LauncherModel extends BroadcastReceiver // Id would be valid only if the widget restore broadcast was received. if (isIdValid) { - status = LauncherAppWidgetInfo.RESTORE_COMPLETED; + status = LauncherAppWidgetInfo.FLAG_UI_NOT_READY; } else { status &= ~LauncherAppWidgetInfo .FLAG_PROVIDER_NOT_READY; @@ -3197,6 +3197,12 @@ public class LauncherModel extends BroadcastReceiver widgetInfo.restoreStatus &= ~LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY & ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; + + // adding this flag ensures that launcher shows 'click to setup' + // if the widget has a config activity. In case there is no config + // activity, it will be marked as 'restored' during bind. + widgetInfo.restoreStatus |= LauncherAppWidgetInfo.FLAG_UI_NOT_READY; + widgets.add(widgetInfo); updateItemInDatabase(context, widgetInfo); } |