diff options
author | Tony Wickham <twickham@google.com> | 2018-05-16 14:26:40 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2018-05-16 14:27:49 -0700 |
commit | ec62522682e1990f083178b452285b06fe4a68d0 (patch) | |
tree | d968559d558e48059004b1b5aec6c0b6d1d0cfa9 /src | |
parent | 61745e17c75612d97b62313723831e51d62191bf (diff) | |
download | android_packages_apps_Trebuchet-ec62522682e1990f083178b452285b06fe4a68d0.tar.gz android_packages_apps_Trebuchet-ec62522682e1990f083178b452285b06fe4a68d0.tar.bz2 android_packages_apps_Trebuchet-ec62522682e1990f083178b452285b06fe4a68d0.zip |
Set status bar icons to dark at correct all apps progress
Bug: 79866102
Change-Id: I8c97896319406c8360a2f60d213868ad59dafe19
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 5dcfe4a70..a8fab5f48 100644 --- a/src/com/android/launcher3/views/ScrimView.java +++ b/src/com/android/launcher3/views/ScrimView.java @@ -388,4 +388,8 @@ public class ScrimView extends View implements Insettable, OnChangeListener, return false; } } + + public int getDragHandleSize() { + return mDragHandleSize; + } } |