diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-06-18 18:32:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-18 18:32:48 +0000 |
| commit | 350529ec40ba7f0aa359717d40b39ed09ee1710f (patch) | |
| tree | 61f255947289ae06ed215d071134e39b12b41429 | |
| parent | b3c720436b61f446a70e8c12f181e648ef7372fc (diff) | |
| parent | e25c5d1c94949044c4cd7416f60ea0dc12dadc8d (diff) | |
| download | android_packages_apps_Trebuchet-350529ec40ba7f0aa359717d40b39ed09ee1710f.tar.gz android_packages_apps_Trebuchet-350529ec40ba7f0aa359717d40b39ed09ee1710f.tar.bz2 android_packages_apps_Trebuchet-350529ec40ba7f0aa359717d40b39ed09ee1710f.zip | |
am e25c5d1c: Prevent discordant state between Workspace and Launcher (issue 15409018)
* commit 'e25c5d1c94949044c4cd7416f60ea0dc12dadc8d':
Prevent discordant state between Workspace and Launcher (issue 15409018)
| -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 : |