summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon McAnsh <brandon.mcansh@gmail.com>2015-07-07 23:35:11 -0400
committerRajesh Yengisetty <rajesh@cyngn.com>2015-07-14 10:51:27 -0700
commit5e950d26991f18b9844e2e9ab03ab6cb9767da1c (patch)
tree4931d22fc3afa1296f385928278f353d68fa865a
parent2ee7ccecc8705f48d05104e0dcba9f118195af56 (diff)
downloadandroid_packages_apps_Trebuchet-5e950d26991f18b9844e2e9ab03ab6cb9767da1c.tar.gz
android_packages_apps_Trebuchet-5e950d26991f18b9844e2e9ab03ab6cb9767da1c.tar.bz2
android_packages_apps_Trebuchet-5e950d26991f18b9844e2e9ab03ab6cb9767da1c.zip
Launcher: Close open folder when transitioning back to Workspace.State.NORMAL
* There was a nasty bug that would show an open folder behind the workspace when the screen timed and was quickly resumed, or when the screen was quickly toggled off/on before the activity lifecycle callbacks could react. * Close the open folders during showWorkspace() to prevent this. Change-Id: I6e0b6f4d99bbbabb283903a9ce92da5ae22609ce Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
-rw-r--r--src/com/android/launcher3/Launcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c2debec43..45f46742f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4315,6 +4315,9 @@ public class Launcher extends Activity
void showWorkspace(boolean animated, Runnable onCompleteRunnable) {
if (mState != State.WORKSPACE || mWorkspace.getState() != Workspace.State.NORMAL) {
boolean wasInSpringLoadedMode = (mState != State.WORKSPACE);
+ if (mWorkspace.getOpenFolder() != null) {
+ closeFolder(false);
+ }
mWorkspace.setVisibility(View.VISIBLE);
hideAppsCustomizeHelper(Workspace.State.NORMAL, animated, false, onCompleteRunnable);