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

Don't invert legacy notifications

Browse Source 
Bug: 19130917
Change-Id: Id06fcf8fb11b783360a86534e024164b230e84a4
This commit is contained in:
Jorim Jaggi
2015-06-05 15:18:43 -07:00
parent 7b5e6c884d
commit 59ec304eae
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -903,12 +903,18 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
return mShowingPublic ? mPublicLayout : mPrivateLayout;
}
@Override
public void setShowingLegacyBackground(boolean showing) {
super.setShowingLegacyBackground(showing);
mPrivateLayout.setShowingLegacyBackground(showing);
mPublicLayout.setShowingLegacyBackground(showing);
}
public void setExpansionLogger(ExpansionLogger logger, String key) {
mLogger = logger;
mLoggingKey = key;
}
private void logExpansionEvent(boolean userAction, boolean wasExpanded) {
final boolean nowExpanded = isExpanded();
if (wasExpanded != nowExpanded && mLogger != null) {

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

@@ -67,6 +67,8 @@ public class NotificationContentView extends FrameLayout {
private final Paint mFadePaint = new Paint();
private boolean mAnimate;
private boolean mIsHeadsUp;
private boolean mShowingLegacyBackground;
private final ViewTreeObserver.OnPreDrawListener mEnableAnimationPredrawListener
= new ViewTreeObserver.OnPreDrawListener() {
@Override
@@ -421,7 +423,7 @@ public class NotificationContentView extends FrameLayout {
public void setDark(boolean dark, boolean fade, long delay) {
if (mDark == dark || mContractedChild == null) return;
mDark = dark;
mContractedWrapper.setDark(dark, fade, delay);
mContractedWrapper.setDark(dark && !mShowingLegacyBackground, fade, delay);
}
public void setHeadsUp(boolean headsUp) {
@@ -436,4 +438,8 @@ public class NotificationContentView extends FrameLayout {
// layout, and saves us some layers.
return false;
}
public void setShowingLegacyBackground(boolean showing) {
mShowingLegacyBackground = showing;
}
}