diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-06-18 10:34:58 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-06-18 10:38:31 -0700 |
| commit | e25c5d1c94949044c4cd7416f60ea0dc12dadc8d (patch) | |
| tree | 61f255947289ae06ed215d071134e39b12b41429 /src | |
| parent | 7fa0ae5056f753a26f267b633bbc160b2b86f725 (diff) | |
| download | android_packages_apps_Trebuchet-e25c5d1c94949044c4cd7416f60ea0dc12dadc8d.tar.gz android_packages_apps_Trebuchet-e25c5d1c94949044c4cd7416f60ea0dc12dadc8d.tar.bz2 android_packages_apps_Trebuchet-e25c5d1c94949044c4cd7416f60ea0dc12dadc8d.zip | |
Prevent discordant state between Workspace and Launcher (issue 15409018)
Change-Id: I13bb3e51da18998a5dade49c50e5fbf2266022d3
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 60efcea6d..d76b2382e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3380,10 +3380,7 @@ public class Launcher extends Activity } void showWorkspace(boolean animated, Runnable onCompleteRunnable) { - if (mWorkspace.isInOverviewMode()) { - mWorkspace.exitOverviewMode(animated); - } - if (mState != State.WORKSPACE) { + if (mState != State.WORKSPACE || mWorkspace.getState() != Workspace.State.NORMAL) { boolean wasInSpringLoadedMode = (mState != State.WORKSPACE); mWorkspace.setVisibility(View.VISIBLE); hideAppsCustomizeHelper(Workspace.State.NORMAL, animated, false, onCompleteRunnable); @@ -3472,7 +3469,6 @@ public class Launcher extends Activity } } }, delay); - } void exitSpringLoadedDragMode() { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index bd9287fb2..6afea8268 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2204,6 +2204,10 @@ public class Workspace extends SmoothPagedView updateAccessibilityFlags(); } + State getState() { + return mState; + } + private void updateAccessibilityFlags() { int accessible = mState == State.NORMAL ? ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES : |