diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-04 17:30:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-04 17:30:06 +0000 |
| commit | 56ad97cf2de97ea91fff6e6ab5165791f272f5ba (patch) | |
| tree | 3efe516279e77df2f699f2b16d28f62ac4bc97d3 /src | |
| parent | 402fb03160eeebbfcf638412d5cdfcf8b83520bf (diff) | |
| parent | 3051dbabe7d32026339fa7afbd02f0d354a221a8 (diff) | |
| download | android_packages_apps_Trebuchet-56ad97cf2de97ea91fff6e6ab5165791f272f5ba.tar.gz android_packages_apps_Trebuchet-56ad97cf2de97ea91fff6e6ab5165791f272f5ba.tar.bz2 android_packages_apps_Trebuchet-56ad97cf2de97ea91fff6e6ab5165791f272f5ba.zip | |
Merge "Switch the status bar color earlier in the all apps transition" into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 4 |
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 44e0a0474..b85321e63 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, VerticalPul } // 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); |