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

Merge "Made sure that the ambient single line view remains invisible" into pi-dev

Browse Source 
am: 75402c371b

Change-Id: I171b5e8251fc1cd5133e39cfc4ddc2f8eaa49ff2
This commit is contained in:
Selim Cinek
2018-05-15 13:01:43 -07:00
committed by android-build-merger
parent 554fb5d4c6 75402c371b
commit f15f5047fa
1 changed files with 10 additions and 0 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

@@ -1199,8 +1199,13 @@ public class NotificationContentView extends FrameLayout {
} }
private void updateSingleLineView() { private void updateSingleLineView() {
if (mIsChildInGroup) { if (mIsChildInGroup) {
boolean isNewView = mSingleLineView == null;
mSingleLineView = mHybridGroupManager.bindFromNotification( mSingleLineView = mHybridGroupManager.bindFromNotification(
mSingleLineView, mStatusBarNotification.getNotification()); mSingleLineView, mStatusBarNotification.getNotification());
if (isNewView) {
updateViewVisibility(mVisibleType, VISIBLE_TYPE_SINGLELINE,
mSingleLineView, mSingleLineView);
}
} else if (mSingleLineView != null) { } else if (mSingleLineView != null) {
removeView(mSingleLineView); removeView(mSingleLineView);
mSingleLineView = null; mSingleLineView = null;
@@ -1209,8 +1214,13 @@ public class NotificationContentView extends FrameLayout {
private void updateAmbientSingleLineView() { private void updateAmbientSingleLineView() {
if (mIsChildInGroup) { if (mIsChildInGroup) {
boolean isNewView = mAmbientSingleLineChild == null;
mAmbientSingleLineChild = mHybridGroupManager.bindAmbientFromNotification( mAmbientSingleLineChild = mHybridGroupManager.bindAmbientFromNotification(
mAmbientSingleLineChild, mStatusBarNotification.getNotification()); mAmbientSingleLineChild, mStatusBarNotification.getNotification());
if (isNewView) {
updateViewVisibility(mVisibleType, VISIBLE_TYPE_AMBIENT_SINGLELINE,
mAmbientSingleLineChild, mAmbientSingleLineChild);
}
} else if (mAmbientSingleLineChild != null) { } else if (mAmbientSingleLineChild != null) {
removeView(mAmbientSingleLineChild); removeView(mAmbientSingleLineChild);
mAmbientSingleLineChild = null; mAmbientSingleLineChild = null;