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

Merge "AOD: Invert color spans for ambient display view"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-08 02:49:08 +00:00
committed by Android (Google) Code Review
parent 915b42bd95 0bc3f6aae2
commit 9d64b054d2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/Notification.java
View File

@@ -72,6 +72,7 @@ import android.widget.RemoteViews;
import com.android.internal.R;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.NotificationColorUtil;
import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -4068,7 +4069,7 @@ public class Notification implements Parcelable
public RemoteViews makeAmbientNotification() {
RemoteViews ambient = applyStandardTemplateWithActions(
R.layout.notification_template_material_ambient,
mParams.reset().fillTextsFrom(this).hasProgress(false).ambient(true));
mParams.reset().ambient(true).fillTextsFrom(this).hasProgress(false));
return ambient;
}
@@ -4381,7 +4382,13 @@ public class Notification implements Parcelable
}
private CharSequence processLegacyText(CharSequence charSequence) {
if (isLegacy() || textColorsNeedInversion()) {
return processLegacyText(charSequence, false /* ambient */);
}
private CharSequence processLegacyText(CharSequence charSequence, boolean ambient) {
boolean isAlreadyLightText = isLegacy() || textColorsNeedInversion();
boolean wantLightText = ambient;
if (isAlreadyLightText != wantLightText) {
return getColorUtil().invertCharSequenceColors(charSequence);
} else {
return charSequence;
@@ -7853,14 +7860,15 @@ public class Notification implements Parcelable
}
final StandardTemplateParams ambient(boolean ambient) {
Preconditions.checkState(title == null && text == null, "must set ambient before text");
this.ambient = ambient;
return this;
}
final StandardTemplateParams fillTextsFrom(Builder b) {
Bundle extras = b.mN.extras;
title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE));
text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT));
title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE), ambient);
text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT), ambient);
return this;
}
}