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

Merge "Added safeguard to make sure Panel is visible when unlocked" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-26 21:25:18 +00:00
committed by Android (Google) Code Review
parent e831c9fdd9 d09ec7e241
commit 8f411b9990
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -4747,7 +4747,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
boolean nowFullyHidden = mAmbientState.isFullyHidden();
boolean nowHiddenAtAll = mAmbientState.isHiddenAtAll();
if (nowFullyHidden != wasFullyHidden) {
setVisibility(mAmbientState.isFullyHidden() ? View.INVISIBLE : View.VISIBLE);
updateVisibility();
}
if (!wasHiddenAtAll && nowHiddenAtAll) {
resetExposedMenuView(true /* animate */, true /* animate */);
@@ -4760,6 +4760,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
requestChildrenUpdate();
}
private void updateVisibility() {
boolean shouldShow = !mAmbientState.isFullyHidden() || !onKeyguard();
setVisibility(shouldShow ? View.VISIBLE : View.INVISIBLE);
}
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
public void notifyHideAnimationStart(boolean hide) {
// We only swap the scaling factor if we're fully hidden or fully awake to avoid
@@ -5268,6 +5273,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
onUpdateRowStates();
mEntryManager.updateNotifications();
updateVisibility();
}
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)