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

Fixed that the HUN layout could be visible on Keyguard

Browse Source 
Test: runtest systemui
Merged-In: I9d106b6b021bb15fd709a6281beed8ab084201db
Change-Id: I9d106b6b021bb15fd709a6281beed8ab084201db
Fixes: 34548351
This commit is contained in:
Selim Cinek
2017-01-31 16:09:23 -08:00
parent 66d545bfe9
commit b5aa599eec
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -456,7 +456,8 @@ public class NotificationContentView extends FrameLayout {
isTransitioningFromTo(VISIBLE_TYPE_HEADSUP, VISIBLE_TYPE_EXPANDED) || isTransitioningFromTo(VISIBLE_TYPE_HEADSUP, VISIBLE_TYPE_EXPANDED) ||
isTransitioningFromTo(VISIBLE_TYPE_EXPANDED, VISIBLE_TYPE_HEADSUP); isTransitioningFromTo(VISIBLE_TYPE_EXPANDED, VISIBLE_TYPE_HEADSUP);
boolean pinned = !isVisibleOrTransitioning(VISIBLE_TYPE_CONTRACTED) boolean pinned = !isVisibleOrTransitioning(VISIBLE_TYPE_CONTRACTED)
&& (mIsHeadsUp || mHeadsupDisappearRunning); && (mIsHeadsUp || mHeadsupDisappearRunning)
&& !mContainingNotification.isOnKeyguard();
if (transitioningBetweenHunAndExpanded || pinned) { if (transitioningBetweenHunAndExpanded || pinned) {
return Math.min(mHeadsUpChild.getHeight(), mExpandedChild.getHeight()); return Math.min(mHeadsUpChild.getHeight(), mExpandedChild.getHeight());
} }
@@ -560,7 +561,7 @@ public class NotificationContentView extends FrameLayout {
public int getMaxHeight() { public int getMaxHeight() {
if (mExpandedChild != null) { if (mExpandedChild != null) {
return mExpandedChild.getHeight(); return mExpandedChild.getHeight();
} else if (mIsHeadsUp && mHeadsUpChild != null) { } else if (mIsHeadsUp && mHeadsUpChild != null && !mContainingNotification.isOnKeyguard()) {
return mHeadsUpChild.getHeight(); return mHeadsUpChild.getHeight();
} }
return mContractedChild.getHeight(); return mContractedChild.getHeight();
@@ -840,7 +841,8 @@ public class NotificationContentView extends FrameLayout {
return VISIBLE_TYPE_SINGLELINE; return VISIBLE_TYPE_SINGLELINE;
} }
if ((mIsHeadsUp || mHeadsupDisappearRunning) && mHeadsUpChild != null) { if ((mIsHeadsUp || mHeadsupDisappearRunning) && mHeadsUpChild != null
&& !mContainingNotification.isOnKeyguard()) {
if (viewHeight <= mHeadsUpChild.getHeight() || noExpandedChild) { if (viewHeight <= mHeadsUpChild.getHeight() || noExpandedChild) {
return VISIBLE_TYPE_HEADSUP; return VISIBLE_TYPE_HEADSUP;
} else { } else {
@@ -1086,7 +1088,7 @@ public class NotificationContentView extends FrameLayout {
mExpandable = expandable; mExpandable = expandable;
// if the expanded child has the same height as the collapsed one we hide it. // if the expanded child has the same height as the collapsed one we hide it.
if (mExpandedChild != null && mExpandedChild.getHeight() != 0) { if (mExpandedChild != null && mExpandedChild.getHeight() != 0) {
if ((!mIsHeadsUp || mHeadsUpChild == null)) { if (!mIsHeadsUp || mHeadsUpChild == null || mContainingNotification.isOnKeyguard()) {
if (mExpandedChild.getHeight() == mContractedChild.getHeight()) { if (mExpandedChild.getHeight() == mContractedChild.getHeight()) {
expandable = false; expandable = false;
} }