From 9c0941fe7fa0e43ab77a95a5ad729c32c46fd9bf Mon Sep 17 00:00:00 2001 From: Lyn Han Date: Wed, 4 Nov 2020 07:00:53 -0600 Subject: Remove half-swipe shelf behind notifications Bug: 171817112 Test: manual, for minimized, expanded, heads up notifs adb shell settings put global show_new_notif_dismiss [0|1] 1) disable flag - undershelf unchanged 2) enable flag - undershelf gone Change-Id: Id00b76e729f87e44aaede8a033740a51b182559d --- .../statusbar/notification/row/ExpandableNotificationRow.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 280c525f41cf..79debc6ff962 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -35,6 +35,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.Path; import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.AnimationDrawable; @@ -43,6 +44,7 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; +import android.provider.Settings; import android.service.notification.StatusBarNotification; import android.util.ArraySet; import android.util.AttributeSet; @@ -1155,10 +1157,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView */ @Nullable public NotificationMenuRowPlugin createMenu() { - if (mMenuRow == null) { + final boolean removeShelf = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.SHOW_NEW_NOTIF_DISMISS, 0 /* show shelf by default */) == 1; + if (mMenuRow == null || removeShelf) { return null; } - if (mMenuRow.getMenuView() == null) { mMenuRow.createMenu(this, mEntry.getSbn()); mMenuRow.setAppName(mAppName); -- cgit v1.2.3-59-g8ed1b