From ec62522682e1990f083178b452285b06fe4a68d0 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 16 May 2018 14:26:40 -0700 Subject: [PATCH] Set status bar icons to dark at correct all apps progress Bug: 79866102 Change-Id: I8c97896319406c8360a2f60d213868ad59dafe19 --- .../launcher3/allapps/AllAppsTransitionController.java | 3 ++- src/com/android/launcher3/views/ScrimView.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 113571a22f..0ae58dbcce 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 5dcfe4a708..a8fab5f480 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; + } }