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

Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2014-12-02 19:35:39 +00:00
committed by Android (Google) Code Review
parent 221b545cda 394a5d68b5
commit dad13577e5
4 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,6 +244,9 @@ public class NotificationContentView extends FrameLayout {
public void notifyContentUpdated() {
selectLayout(false /* animate */, true /* force */);
if (mContractedChild != null) {
mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);
}
}
public boolean isContentExpandable() {

12
packages/SystemUI/src/com/android/systemui/statusbar/NotificationCustomViewWrapper.java
View File

@@ -27,7 +27,6 @@ import com.android.systemui.statusbar.phone.NotificationPanelView;
public class NotificationCustomViewWrapper extends NotificationViewWrapper {
private final ViewInvertHelper mInvertHelper;
private boolean mDark;
protected NotificationCustomViewWrapper(View view) {
super(view);
@@ -36,13 +35,10 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper {
@Override
public void setDark(boolean dark, boolean fade, long delay) {
if (mDark != dark) {
mDark = dark;
if (fade) {
mInvertHelper.fade(dark, delay);
} else {
mInvertHelper.update(dark);
}
if (fade) {
mInvertHelper.fade(dark, delay);
} else {
mInvertHelper.update(dark);
}
}
}

9
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaViewWrapper.java
View File

@@ -24,19 +24,14 @@ import android.view.View;
*/
public class NotificationMediaViewWrapper extends NotificationTemplateViewWrapper {
private boolean mDark;
protected NotificationMediaViewWrapper(Context ctx, View view) {
super(ctx, view);
}
@Override
public void setDark(boolean dark, boolean fade, long delay) {
if (mDark != dark) {
mDark = dark;
// Only update the large icon, because the rest is already inverted.
setPictureGrayscale(dark, fade, delay);
}
// Only update the large icon, because the rest is already inverted.
setPictureGrayscale(dark, fade, delay);
}
}

35
packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java
View File

@@ -51,8 +51,6 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper {
private final int mIconBackgroundDarkColor;
private final Interpolator mLinearOutSlowInInterpolator;
private boolean mDark;
protected NotificationTemplateViewWrapper(Context ctx, View view) {
super(view);
mIconDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
@@ -95,26 +93,23 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper {
@Override
public void setDark(boolean dark, boolean fade, long delay) {
if (mDark != dark) {
mDark = dark;
if (mInvertHelper != null) {
if (fade) {
mInvertHelper.fade(dark, delay);
} else {
mInvertHelper.update(dark);
}
if (mInvertHelper != null) {
if (fade) {
mInvertHelper.fade(dark, delay);
} else {
mInvertHelper.update(dark);
}
if (mIcon != null) {
if (fade) {
fadeIconColorFilter(mIcon, dark, delay);
fadeIconAlpha(mIcon, dark, delay);
} else {
updateIconColorFilter(mIcon, dark);
updateIconAlpha(mIcon, dark);
}
}
setPictureGrayscale(dark, fade, delay);
}
if (mIcon != null) {
if (fade) {
fadeIconColorFilter(mIcon, dark, delay);
fadeIconAlpha(mIcon, dark, delay);
} else {
updateIconColorFilter(mIcon, dark);
updateIconAlpha(mIcon, dark);
}
}
setPictureGrayscale(dark, fade, delay);
}
protected void setPictureGrayscale(boolean grayscale, boolean fade, long delay) {