| commit | 87b1d85fcb6b4818248c1d2de22bcd321b01e487 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed May 16 21:27:59 2018 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed May 16 21:27:59 2018 +0000 |
| tree | 2bec537f7dd1506abcb1624e767f4a20b27ea7a6 | |
| parent | d4ed0858bd6ec8e41d5439b6206aeed2307031a7 [diff] | |
| parent | ec62522682e1990f083178b452285b06fe4a68d0 [diff] |
[automerger] Set status bar icons to dark at correct all apps progress am: ec62522682 Change-Id: I14e4efb263f98254934a5af8bc047861c717291d
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 113571a..0ae58db 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -128,7 +128,8 @@ // 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 49e96be..6bbce00 100644 --- a/src/com/android/launcher3/views/ScrimView.java +++ b/src/com/android/launcher3/views/ScrimView.java
@@ -397,4 +397,8 @@ return false; } } + + public int getDragHandleSize() { + return mDragHandleSize; + } }