diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-06-05 10:44:02 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2019-06-05 10:44:02 -0700 |
| commit | 87c8a511cd4f38f4752a7882fbb4abc7206cefb6 (patch) | |
| tree | 535b830876fe3ab97adc9e84a9d896301662068f /src | |
| parent | 8474ab2b9dfb05daf82f0afe3f05181a2e40b89c (diff) | |
| parent | f17eb616a853fbbe30c9973a5a6987f0218503be (diff) | |
| download | android_packages_apps_Trebuchet-87c8a511cd4f38f4752a7882fbb4abc7206cefb6.tar.gz android_packages_apps_Trebuchet-87c8a511cd4f38f4752a7882fbb4abc7206cefb6.tar.bz2 android_packages_apps_Trebuchet-87c8a511cd4f38f4752a7882fbb4abc7206cefb6.zip | |
resolve merge conflicts of f17eb616a853fbbe30c9973a5a6987f0218503be to ub-launcher3-qt-r1-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4e177dfb7ba3bde6eb53f63c2f2df273feef90ee
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherState.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 3a92dfb96..c63f976a8 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -258,9 +258,6 @@ public class LauncherState { * Called when the start transition ends and the user settles on this particular state. */ public void onStateTransitionEnd(Launcher launcher) { - if (this == NORMAL || this == SPRING_LOADED) { - UiFactory.resetOverview(launcher); - } if (this == NORMAL) { // Clear any rotation locks when going to normal state launcher.getRotationHelper().setCurrentStateRequest(REQUEST_NONE); |