diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-20 20:44:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 20:44:51 +0000 |
| commit | 62edad0f14b16a1f0a2f04de8fe0708270971730 (patch) | |
| tree | e9a629c466525b8d371ffde452ef8fb3f2c3d4f7 /src/com/android/launcher3/LauncherModel.java | |
| parent | f745906adc41e846dc00ca08202347ff4bb9554b (diff) | |
| parent | 2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7 (diff) | |
| download | android_packages_apps_Trebuchet-62edad0f14b16a1f0a2f04de8fe0708270971730.tar.gz android_packages_apps_Trebuchet-62edad0f14b16a1f0a2f04de8fe0708270971730.tar.bz2 android_packages_apps_Trebuchet-62edad0f14b16a1f0a2f04de8fe0708270971730.zip | |
am 2fb6609c: Merge "Showing widgets in a disabled state, when running in safe mode" into ub-now-queens
* commit '2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7':
Showing widgets in a disabled state, when running in safe mode
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index f747423e6..f0899a852 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2278,7 +2278,7 @@ public class LauncherModel extends BroadcastReceiver // App restore has started. Update the flag appWidgetInfo.restoreStatus |= LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; - } else if (REMOVE_UNRESTORED_ICONS) { + } else if (REMOVE_UNRESTORED_ICONS && !isSafeMode) { Launcher.addDumpLog(TAG, "Unrestored widget removed: " + component, true); itemsToRemove.add(id); |