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

Merge "Make bubble channel setting 3 state with unset / on / off" into rvc-dev am: 582784757d

Browse Source 
Change-Id: Ia1517e22b8319e1982edc84918f3029643913920
This commit is contained in:
Mady Mellor
2020-04-21 22:36:49 +00:00
committed by Automerger Merge Worker
parent f37ded68ae 582784757d
commit 8bb2374fc9
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/java/android/app/NotificationChannel.java
View File

@@ -102,7 +102,7 @@ public final class NotificationChannel implements Parcelable {
private static final String ATT_FG_SERVICE_SHOWN = "fgservice"; private static final String ATT_FG_SERVICE_SHOWN = "fgservice";
private static final String ATT_GROUP = "group"; private static final String ATT_GROUP = "group";
private static final String ATT_BLOCKABLE_SYSTEM = "blockable_system"; private static final String ATT_BLOCKABLE_SYSTEM = "blockable_system";
private static final String ATT_ALLOW_BUBBLE = "allow_bubble"; private static final String ATT_ALLOW_BUBBLE = "allow_bubbles";
private static final String ATT_ORIG_IMP = "orig_imp"; private static final String ATT_ORIG_IMP = "orig_imp";
private static final String ATT_PARENT_CHANNEL = "parent"; private static final String ATT_PARENT_CHANNEL = "parent";
private static final String ATT_CONVERSATION_ID = "conv_id"; private static final String ATT_CONVERSATION_ID = "conv_id";
@@ -168,7 +168,12 @@ public final class NotificationChannel implements Parcelable {
NotificationManager.IMPORTANCE_UNSPECIFIED; NotificationManager.IMPORTANCE_UNSPECIFIED;
private static final boolean DEFAULT_DELETED = false; private static final boolean DEFAULT_DELETED = false;
private static final boolean DEFAULT_SHOW_BADGE = true; private static final boolean DEFAULT_SHOW_BADGE = true;
private static final boolean DEFAULT_ALLOW_BUBBLE = false; /**
* @hide
*/
public static final int DEFAULT_ALLOW_BUBBLE = -1;
private static final int ALLOW_BUBBLE_ON = 1;
private static final int ALLOW_BUBBLE_OFF = 0;
@UnsupportedAppUsage @UnsupportedAppUsage
private String mId; private String mId;
@@ -193,7 +198,7 @@ public final class NotificationChannel implements Parcelable {
private AudioAttributes mAudioAttributes = Notification.AUDIO_ATTRIBUTES_DEFAULT; private AudioAttributes mAudioAttributes = Notification.AUDIO_ATTRIBUTES_DEFAULT;
// If this is a blockable system notification channel. // If this is a blockable system notification channel.
private boolean mBlockableSystem = false; private boolean mBlockableSystem = false;
private boolean mAllowBubbles = DEFAULT_ALLOW_BUBBLE; private int mAllowBubbles = DEFAULT_ALLOW_BUBBLE;
private boolean mImportanceLockedByOEM; private boolean mImportanceLockedByOEM;
private boolean mImportanceLockedDefaultApp; private boolean mImportanceLockedDefaultApp;
private String mParentId = null; private String mParentId = null;
@@ -261,7 +266,7 @@ public final class NotificationChannel implements Parcelable {
mAudioAttributes = in.readInt() > 0 ? AudioAttributes.CREATOR.createFromParcel(in) : null; mAudioAttributes = in.readInt() > 0 ? AudioAttributes.CREATOR.createFromParcel(in) : null;
mLightColor = in.readInt(); mLightColor = in.readInt();
mBlockableSystem = in.readBoolean(); mBlockableSystem = in.readBoolean();
mAllowBubbles = in.readBoolean(); mAllowBubbles = in.readInt();
mImportanceLockedByOEM = in.readBoolean(); mImportanceLockedByOEM = in.readBoolean();
mOriginalImportance = in.readInt(); mOriginalImportance = in.readInt();
mParentId = in.readString(); mParentId = in.readString();
@@ -320,7 +325,7 @@ public final class NotificationChannel implements Parcelable {
} }
dest.writeInt(mLightColor); dest.writeInt(mLightColor);
dest.writeBoolean(mBlockableSystem); dest.writeBoolean(mBlockableSystem);
dest.writeBoolean(mAllowBubbles); dest.writeInt(mAllowBubbles);
dest.writeBoolean(mImportanceLockedByOEM); dest.writeBoolean(mImportanceLockedByOEM);
dest.writeInt(mOriginalImportance); dest.writeInt(mOriginalImportance);
dest.writeString(mParentId); dest.writeString(mParentId);
@@ -550,7 +555,14 @@ public final class NotificationChannel implements Parcelable {
* @see Notification#getBubbleMetadata() * @see Notification#getBubbleMetadata()
*/ */
public void setAllowBubbles(boolean allowBubbles) { public void setAllowBubbles(boolean allowBubbles) {
mAllowBubbles = allowBubbles; mAllowBubbles = allowBubbles ? ALLOW_BUBBLE_ON : ALLOW_BUBBLE_OFF;
}
/**
* @hide
*/
public void setAllowBubbles(int allowed) {
mAllowBubbles = allowed;
} }
/** /**
@@ -701,6 +713,13 @@ public final class NotificationChannel implements Parcelable {
* @see Notification#getBubbleMetadata() * @see Notification#getBubbleMetadata()
*/ */
public boolean canBubble() { public boolean canBubble() {
return mAllowBubbles == ALLOW_BUBBLE_ON;
}
/**
* @hide
*/
public int getAllowBubbles() {
return mAllowBubbles; return mAllowBubbles;
} }
@@ -872,7 +891,7 @@ public final class NotificationChannel implements Parcelable {
lockFields(safeInt(parser, ATT_USER_LOCKED, 0)); lockFields(safeInt(parser, ATT_USER_LOCKED, 0));
setFgServiceShown(safeBool(parser, ATT_FG_SERVICE_SHOWN, false)); setFgServiceShown(safeBool(parser, ATT_FG_SERVICE_SHOWN, false));
setBlockable(safeBool(parser, ATT_BLOCKABLE_SYSTEM, false)); setBlockable(safeBool(parser, ATT_BLOCKABLE_SYSTEM, false));
setAllowBubbles(safeBool(parser, ATT_ALLOW_BUBBLE, DEFAULT_ALLOW_BUBBLE)); setAllowBubbles(safeInt(parser, ATT_ALLOW_BUBBLE, DEFAULT_ALLOW_BUBBLE));
setOriginalImportance(safeInt(parser, ATT_ORIG_IMP, DEFAULT_IMPORTANCE)); setOriginalImportance(safeInt(parser, ATT_ORIG_IMP, DEFAULT_IMPORTANCE));
setConversationId(parser.getAttributeValue(null, ATT_PARENT_CHANNEL), setConversationId(parser.getAttributeValue(null, ATT_PARENT_CHANNEL),
parser.getAttributeValue(null, ATT_CONVERSATION_ID)); parser.getAttributeValue(null, ATT_CONVERSATION_ID));
@@ -996,8 +1015,8 @@ public final class NotificationChannel implements Parcelable {
if (isBlockable()) { if (isBlockable()) {
out.attribute(null, ATT_BLOCKABLE_SYSTEM, Boolean.toString(isBlockable())); out.attribute(null, ATT_BLOCKABLE_SYSTEM, Boolean.toString(isBlockable()));
} }
if (canBubble() != DEFAULT_ALLOW_BUBBLE) { if (getAllowBubbles() != DEFAULT_ALLOW_BUBBLE) {
out.attribute(null, ATT_ALLOW_BUBBLE, Boolean.toString(canBubble())); out.attribute(null, ATT_ALLOW_BUBBLE, Integer.toString(getAllowBubbles()));
} }
if (getOriginalImportance() != DEFAULT_IMPORTANCE) { if (getOriginalImportance() != DEFAULT_IMPORTANCE) {
out.attribute(null, ATT_ORIG_IMP, Integer.toString(getOriginalImportance())); out.attribute(null, ATT_ORIG_IMP, Integer.toString(getOriginalImportance()));
@@ -1059,7 +1078,7 @@ public final class NotificationChannel implements Parcelable {
record.put(ATT_DELETED, Boolean.toString(isDeleted())); record.put(ATT_DELETED, Boolean.toString(isDeleted()));
record.put(ATT_GROUP, getGroup()); record.put(ATT_GROUP, getGroup());
record.put(ATT_BLOCKABLE_SYSTEM, isBlockable()); record.put(ATT_BLOCKABLE_SYSTEM, isBlockable());
record.put(ATT_ALLOW_BUBBLE, canBubble()); record.put(ATT_ALLOW_BUBBLE, getAllowBubbles());
// TODO: original importance // TODO: original importance
return record; return record;
} }

6
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -819,7 +819,9 @@ public class PreferencesHelper implements RankingConfig {
} }
if (fromTargetApp) { if (fromTargetApp) {
channel.setLockscreenVisibility(r.visibility); channel.setLockscreenVisibility(r.visibility);
channel.setAllowBubbles(existing != null && existing.canBubble()); channel.setAllowBubbles(existing != null
? existing.getAllowBubbles()
: NotificationChannel.DEFAULT_ALLOW_BUBBLE);
} }
clearLockedFieldsLocked(channel); clearLockedFieldsLocked(channel);
channel.setImportanceLockedByOEM(r.oemLockedImportance); channel.setImportanceLockedByOEM(r.oemLockedImportance);
@@ -1704,7 +1706,7 @@ public class PreferencesHelper implements RankingConfig {
if (original.canShowBadge() != update.canShowBadge()) { if (original.canShowBadge() != update.canShowBadge()) {
update.lockFields(NotificationChannel.USER_LOCKED_SHOW_BADGE); update.lockFields(NotificationChannel.USER_LOCKED_SHOW_BADGE);
} }
if (original.canBubble() != update.canBubble()) { if (original.getAllowBubbles() != update.getAllowBubbles()) {
update.lockFields(NotificationChannel.USER_LOCKED_ALLOW_BUBBLE); update.lockFields(NotificationChannel.USER_LOCKED_ALLOW_BUBBLE);
} }
} }