Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev

Browse Source 
am: 5cfe787dec

Change-Id: I909b5989fa79f11e20bb7760bed003077344870e
This commit is contained in:
Evan Laird
2018-05-22 11:48:26 -07:00
committed by android-build-merger
parent f5b7a6aef5 5cfe787dec
commit 7c526756b4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -2090,7 +2090,8 @@ public class StatusBar extends SystemUI implements DemoMode,
* @param animate should the change of the icons be animated. * @param animate should the change of the icons be animated.
*/ */
private void updateHideIconsForBouncer(boolean animate) { private void updateHideIconsForBouncer(boolean animate) {
boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded && mStatusBarWindowHidden; boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded
&& (mStatusBarWindowHidden || mBouncerShowing);
boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing; boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing;
boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard; boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard;
if (mHideIconsForBouncer != shouldHideIconsForBouncer) { if (mHideIconsForBouncer != shouldHideIconsForBouncer) {