diff options
| author | Tony Wickham <twickham@google.com> | 2018-05-16 22:23:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-16 22:23:50 +0000 |
| commit | 2c27df5b5d33076758e7a62388f80ea3ea6f0e19 (patch) | |
| tree | 09a21b8c0181e29b1433f8363251d6257b72bd8c /src | |
| parent | e628c474ea03d5107784f46905ae200c98acde63 (diff) | |
| parent | ec62522682e1990f083178b452285b06fe4a68d0 (diff) | |
| download | android_packages_apps_Trebuchet-2c27df5b5d33076758e7a62388f80ea3ea6f0e19.tar.gz android_packages_apps_Trebuchet-2c27df5b5d33076758e7a62388f80ea3ea6f0e19.tar.bz2 android_packages_apps_Trebuchet-2c27df5b5d33076758e7a62388f80ea3ea6f0e19.zip | |
Merge "Set status bar icons to dark at correct all apps progress" into ub-launcher3-edmonton
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/ScrimView.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 113571a22..0ae58dbcc 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -128,7 +128,8 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil // Use a light system UI (dark icons) if all apps is behind at least half of the // status bar. - boolean forceChange = shiftCurrent <= mShiftRange / 4; + boolean forceChange = shiftCurrent - mScrimView.getDragHandleSize() + <= mLauncher.getDeviceProfile().getInsets().top / 2; if (forceChange) { mLauncher.getSystemUiController().updateUiState(UI_STATE_ALL_APPS, !mIsDarkTheme); } else { diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java index 49e96be6e..6bbce00fe 100644 --- a/src/com/android/launcher3/views/ScrimView.java +++ b/src/com/android/launcher3/views/ScrimView.java @@ -397,4 +397,8 @@ public class ScrimView extends View implements Insettable, OnChangeListener, return false; } } + + public int getDragHandleSize() { + return mDragHandleSize; + } } |