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

Merge "Fix rules for exempting notifications from the expanded state." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-03-11 01:09:20 +00:00
committed by Android (Google) Code Review
parent 455eb1271d 8733c51248
commit 269093b8d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5803,11 +5803,11 @@ public class Notification implements Parcelable
if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {
return true;
}
// If the big content view has no content, we can exempt the app from having to show it.
// Notifications with contentView and without a bigContentView, style, or actions would
// not have an expanded state before S, so showing the standard template expanded state
// usually looks wrong, so we keep it simple and don't show the expanded state.
boolean exempt = mN.contentView != null && mN.bigContentView == null
&& mStyle == null && mActions.size() == 0
&& mN.extras.getCharSequence(EXTRA_TITLE) == null
&& mN.extras.getCharSequence(EXTRA_TEXT) == null;
&& mStyle == null && mActions.size() == 0;
return !exempt;
}