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

Merge "Always highlight unread count" into sc-dev am: 834bf3a8e0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805378

Change-Id: If94087c14df737d6cc60e7f5c4e0b7d5fc06c36e
This commit is contained in:
Jeff DeCew
2021-06-03 18:43:38 +00:00
committed by Automerger Merge Worker
parent e83fc37b96 834bf3a8e0
commit 07952f728a
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/widget/NotificationExpandButton.java
View File

@@ -52,7 +52,6 @@ public class NotificationExpandButton extends FrameLayout {
private int mDefaultTextColor; private int mDefaultTextColor;
private int mHighlightPillColor; private int mHighlightPillColor;
private int mHighlightTextColor; private int mHighlightTextColor;
private boolean mDisallowColor;
public NotificationExpandButton(Context context) { public NotificationExpandButton(Context context) {
this(context, null, 0, 0); this(context, null, 0, 0);
@@ -108,14 +107,6 @@ public class NotificationExpandButton extends FrameLayout {
return super.pointInView(localX, localY, slop); return super.pointInView(localX, localY, slop);
} }
/**
* Disable the use of the accent colors for this view, if true.
*/
public void setGrayedOut(boolean shouldApply) {
mDisallowColor = shouldApply;
updateColors();
}
@Override @Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(info); super.onInitializeAccessibilityNodeInfo(info);
@@ -164,7 +155,7 @@ public class NotificationExpandButton extends FrameLayout {
} }
private void updateColors() { private void updateColors() {
if (shouldShowNumber() && !mDisallowColor) { if (shouldShowNumber()) {
if (mHighlightPillColor != 0) { if (mHighlightPillColor != 0) {
mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor)); mPillView.setBackgroundTintList(ColorStateList.valueOf(mHighlightPillColor));
} }

6
packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
View File

@@ -32,7 +32,6 @@ import com.android.internal.R;
import com.android.internal.widget.CachingIconView; import com.android.internal.widget.CachingIconView;
import com.android.internal.widget.ConversationLayout; import com.android.internal.widget.ConversationLayout;
import com.android.internal.widget.ImageFloatingTextView; import com.android.internal.widget.ImageFloatingTextView;
import com.android.internal.widget.NotificationExpandButton;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.row.NotificationContentView; import com.android.systemui.statusbar.notification.row.NotificationContentView;
@@ -80,11 +79,6 @@ public class NotificationGroupingUtil {
if (icon != null) { if (icon != null) {
icon.setGrayedOut(apply); icon.setGrayedOut(apply);
} }
NotificationExpandButton expand =
view.findViewById(com.android.internal.R.id.expand_button);
if (expand != null) {
expand.setGrayedOut(apply);
}
} }
}; };