commit 56ad97cf2de97ea91fff6e6ab5165791f272f5ba
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 04 17:30:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 04 17:30:06 2017 +0000
tree 3efe516279e77df2f699f2b16d28f62ac4bc97d3
parent 402fb03160eeebbfcf638412d5cdfcf8b83520bf
parent 3051dbabe7d32026339fa7afbd02f0d354a221a8

Merge "Switch the status bar color earlier in the all apps transition" into ub-launcher3-dorval-polish

src/com/android/launcher3/allapps/AllAppsTransitionController.java

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 44e0a04..b85321e 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -283,7 +283,9 @@
         }
 
         // 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);