summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2017-08-04 16:29:25 +0000
committerAdam Cohen <adamcohen@google.com>2017-08-04 16:29:25 +0000
commit3fc21715b312529075b61834d01724d3138f2958 (patch)
tree5efd67d3e869f26217a206e2ce8c00e15d7908f6
parent1af550fa9d65ef2c14043ad7c57c52badd57eb70 (diff)
parent3051dbabe7d32026339fa7afbd02f0d354a221a8 (diff)
downloadandroid_packages_apps_Trebuchet-3fc21715b312529075b61834d01724d3138f2958.zip
android_packages_apps_Trebuchet-3fc21715b312529075b61834d01724d3138f2958.tar.gz
android_packages_apps_Trebuchet-3fc21715b312529075b61834d01724d3138f2958.tar.bz2
[automerger] Switch the status bar color earlier in the all apps transition am: 3051dbabe7
Change-Id: I12f952a555287173bc7ad5e3acca3aaad2b6a1df
-rw-r--r--src/com/android/launcher3/allapps/AllAppsTransitionController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 6896b37..edfe0c1 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -283,7 +283,9 @@ public class AllAppsTransitionController implements TouchController, SwipeDetect
}
// Use a light system UI (dark icons) if all apps is behind at least half of the status bar.
- boolean forceChange = shift <= mStatusBarHeight / 2;
+ boolean forceChange = FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS ?
+ shift <= mShiftRange / 4 :
+ shift <= mStatusBarHeight / 2;
if (forceChange) {
mLauncher.getSystemUiController().updateUiState(
SystemUiController.UI_STATE_ALL_APPS, !mIsDarkTheme);