diff options
| author | Winson Chung <winsonc@google.com> | 2018-05-11 15:18:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-11 15:18:46 +0000 |
| commit | 80a269b8ecc39b1ff6f3109486fe4642a6925a02 (patch) | |
| tree | 94aea892f422c6716e2d3ff4cca39d7cd67ca22d /src | |
| parent | 81abe796197739cccd3c76b729ab151aaeea5090 (diff) | |
| parent | f5d5b6f00fcf64dc7d4a0df5dad683ba8d8921f6 (diff) | |
| download | android_packages_apps_Trebuchet-80a269b8ecc39b1ff6f3109486fe4642a6925a02.tar.gz android_packages_apps_Trebuchet-80a269b8ecc39b1ff6f3109486fe4642a6925a02.tar.bz2 android_packages_apps_Trebuchet-80a269b8ecc39b1ff6f3109486fe4642a6925a02.zip | |
Merge "Revert "Update sysui flags on swipe, skip task backgrounds on opaque apps"" into ub-launcher3-edmonton
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, 1 insertions, 9 deletions
diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 1f70cfaa1..bd38bf00d 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -16,7 +16,6 @@ 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; @@ -154,12 +153,6 @@ 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 7ef53a97d..edbf05a7c 100644 --- a/src/com/android/launcher3/util/SystemUiController.java +++ b/src/com/android/launcher3/util/SystemUiController.java @@ -31,7 +31,6 @@ 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; @@ -39,7 +38,7 @@ public class SystemUiController { public static final int FLAG_DARK_STATUS = 1 << 3; private final Window mWindow; - private final int[] mStates = new int[5]; + private final int[] mStates = new int[4]; public SystemUiController(Window window) { mWindow = window; |