| commit | 7d6207e61b230e659bd953de614b05d51570a7e5 | [log] [tgz] |
|---|---|---|
| author | Samuel Fufa <sfufa@google.com> | Mon Jul 20 22:58:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 20 22:58:32 2020 +0000 |
| tree | 163b2443421df9ec064a6bfca80587f4ab14bfdf | |
| parent | a1603ccdcdb3adff42d824c5dfd3dcde9b5ac1f3 [diff] | |
| parent | 32f5e99519efad71b34da56d5743f3a625f8473f [diff] |
Merge "Allow multiple hotseat restorations in single session" into ub-launcher3-rvc-qpr-dev am: 93802e2612 am: 32f5e99519 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12193279 Change-Id: I34f81041d4368c2ea03d579cd1a96d20ebd65374
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java index 8c1db4e..9e7c9fb 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatRestoreHelper.java
@@ -30,7 +30,6 @@ */ public class HotseatRestoreHelper { private final Launcher mLauncher; - private boolean mBackupRestored = false; HotseatRestoreHelper(Launcher context) { mLauncher = context; @@ -62,7 +61,6 @@ * Finds and restores a previously saved snapshow of Favorites table */ public void restoreBackup() { - if (mBackupRestored) return; MODEL_EXECUTOR.execute(() -> { try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction) LauncherSettings.Settings.call( @@ -78,7 +76,6 @@ idp.numRows); backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true); transaction.commit(); - mBackupRestored = true; mLauncher.getModel().forceReload(); } });