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

Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev

Browse Source 
am: dd9a8017e4

* commit 'dd9a8017e4934007fc5338e2c68b199cd6220001':
  Fixed a bug where the dozemode was incorrectly applied
This commit is contained in:
Selim Cinek
2016-02-23 01:09:06 +00:00
committed by android-build-merger
parent 5cf8722f94 dd9a8017e4
commit 8f03754ad4
1 changed files with 8 additions and 2 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

@@ -523,7 +523,13 @@ public class NotificationContentView extends FrameLayout {
}
public void setDark(boolean dark, boolean fade, long delay) {
if (mDark == dark || mContractedChild == null) return;
setDark(dark, fade, delay, false /* force */);
}
public void setDark(boolean dark, boolean fade, long delay, boolean force) {
if ((!force && mDark == dark) || mContractedChild == null) {
return;
}
mDark = dark;
dark = dark && !mShowingLegacyBackground;
if (mVisibleType == VISIBLE_TYPE_CONTRACTED || !dark) {
@@ -571,7 +577,6 @@ public class NotificationContentView extends FrameLayout {
selectLayout(false /* animate */, true /* force */);
if (mContractedChild != null) {
mContractedWrapper.notifyContentUpdated(entry.notification);
mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);
}
if (mExpandedChild != null) {
mExpandedWrapper.notifyContentUpdated(entry.notification);
@@ -579,6 +584,7 @@ public class NotificationContentView extends FrameLayout {
if (mHeadsUpChild != null) {
mHeadsUpWrapper.notifyContentUpdated(entry.notification);
}
setDark(mDark, false /* animate */, 0 /* delay */, true /* force */);
}
private void updateSingleLineView() {