diff options
author | Winson Chung <winsonc@google.com> | 2018-05-04 16:54:12 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2018-05-10 15:36:44 -0700 |
commit | 5dd46d51eda6e26830c994e9a0581d57316beb51 (patch) | |
tree | f26e2c8f3b82f470fc8f92e79ac202bf5b382075 /src | |
parent | 9b789cbbacd2a9db85d6de6004abfc3100bf9572 (diff) | |
download | android_packages_apps_Trebuchet-5dd46d51eda6e26830c994e9a0581d57316beb51.tar.gz android_packages_apps_Trebuchet-5dd46d51eda6e26830c994e9a0581d57316beb51.tar.bz2 android_packages_apps_Trebuchet-5dd46d51eda6e26830c994e9a0581d57316beb51.zip |
Update sysui flags on swipe, skip task backgrounds on opaque apps
Bug: 79228291
Bug: 77984778
Bug: 78659249
Bug: 73714156
Change-Id: I3bb9ce5b4d5d16bc229a1caba99891cb87775136
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/BaseActivity.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/util/SystemUiController.java | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index bd38bf00d..1f70cfaa1 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -16,6 +16,7 @@ package com.android.launcher3; +import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW; import static java.lang.annotation.RetentionPolicy.SOURCE; import android.app.Activity; @@ -153,6 +154,12 @@ public abstract class BaseActivity extends Activity { protected void onPause() { mActivityFlags &= ~ACTIVITY_STATE_RESUMED; super.onPause(); + + // Reset the overridden sysui flags used for the task-swipe launch animation, we do this + // here instead of at the end of the animation because the start of the new activity does + // not happen immediately, which would cause us to reset to launcher's sysui flags and then + // back to the new app (causing a flash) + getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0); } public boolean isStarted() { diff --git a/src/com/android/launcher3/util/SystemUiController.java b/src/com/android/launcher3/util/SystemUiController.java index edbf05a7c..7ef53a97d 100644 --- a/src/com/android/launcher3/util/SystemUiController.java +++ b/src/com/android/launcher3/util/SystemUiController.java @@ -31,6 +31,7 @@ public class SystemUiController { public static final int UI_STATE_ALL_APPS = 1; public static final int UI_STATE_WIDGET_BOTTOM_SHEET = 2; public static final int UI_STATE_ROOT_VIEW = 3; + public static final int UI_STATE_OVERVIEW = 4; public static final int FLAG_LIGHT_NAV = 1 << 0; public static final int FLAG_DARK_NAV = 1 << 1; @@ -38,7 +39,7 @@ public class SystemUiController { public static final int FLAG_DARK_STATUS = 1 << 3; private final Window mWindow; - private final int[] mStates = new int[4]; + private final int[] mStates = new int[5]; public SystemUiController(Window window) { mWindow = window; |