Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e91eab9 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "Remove unused config toggle for hiding the clear-all button." into main

parents 7666bec1 bb08ef79
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@
    <!-- Whether to show activity indicators in the status bar -->
    <bool name="config_showActivity">false</bool>

    <!-- Whether or not the button to clear all notifications will be shown. -->
    <bool name="config_enableNotificationsClearAll">true</bool>

    <!-- Whether or not to show the notification shelf that houses the icons of notifications that
     have been scrolled off-screen. -->
    <bool name="config_showNotificationShelf">true</bool>
+1 −6
Original line number Diff line number Diff line
@@ -487,8 +487,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
    private ShadeController mShadeController;
    private Consumer<Boolean> mOnStackYChanged;

    protected boolean mClearAllEnabled;

    private Interpolator mHideXInterpolator = Interpolators.FAST_OUT_SLOW_IN;

    private final NotificationSectionsManager mSectionsManager;
@@ -673,7 +671,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
            mDebugPaint.setStyle(Paint.Style.STROKE);
            mDebugPaint.setTextSize(25f);
        }
        mClearAllEnabled = res.getBoolean(R.bool.config_enableNotificationsClearAll);
        mGroupMembershipManager = Dependency.get(GroupMembershipManager.class);
        mGroupExpansionManager = Dependency.get(GroupExpansionManager.class);
        setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
@@ -761,8 +758,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
    }

    private boolean shouldShowDismissView() {
        return mClearAllEnabled
                && mController.hasActiveClearableNotifications(ROWS_ALL);
        return mController.hasActiveClearableNotifications(ROWS_ALL);
    }

    private boolean shouldShowFooterView(boolean showDismissView) {
@@ -5178,7 +5174,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
                    DumpUtilsKt.withIncreasedIndent(
                            pw,
                            () -> {
                                pw.println("mClearAllEnabled: " + mClearAllEnabled);
                                pw.println(
                                        "hasActiveClearableNotifications: "
                                                + mController.hasActiveClearableNotifications(