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

Commit 08883928 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Link to notif history in shade"

parents ef00c0b6 d09bbeef

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -1770,6 +1770,15 @@ public final class Settings { 
    public static final String ACTION_NOTIFICATION_SETTINGS

            = "android.settings.NOTIFICATION_SETTINGS";













    /**













     * Activity Action: Show notification history screen.













     *













     * @hide













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_NOTIFICATION_HISTORY













            = "android.settings.NOTIFICATION_HISTORY";



























    /**















     * Activity Action: Show app listing settings, filtered by those that send notifications.















     *

































packages/SystemUI/res/values/strings.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -1198,6 +1198,9 @@













    <!-- The text for the manage notifications link. [CHAR LIMIT=40] -->















    <string name="manage_notifications_text">Manage</string>





























    <!-- The text for the notification history link. [CHAR LIMIT=40] -->













    <string name="manage_notifications_history_text">History</string>





























    <!-- Section title for notifications that do not vibrate or make noise. [CHAR LIMIT=40] -->















    <string name="notification_section_header_gentle">Silent notifications</string>

















































packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -78,9 +78,9 @@ public class FooterView extends StackScrollerDecorView {













        mDismissButton.setText(R.string.clear_all_notifications_text);















        mDismissButton.setContentDescription(















                mContext.getString(R.string.accessibility_clear_all));













        mManageButton.setText(R.string.manage_notifications_text);













        mManageButton.setText(R.string.manage_notifications_history_text);















        mManageButton.setContentDescription(













                mContext.getString(R.string.accessibility_manage_notification));













                mContext.getString(R.string.manage_notifications_history_text));















    }































    public boolean isButtonVisible() {

































packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -5481,7 +5481,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd





























    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)















    public void manageNotifications(View v) {













        Intent intent = new Intent(Settings.ACTION_ALL_APPS_NOTIFICATION_SETTINGS);













        Intent intent = new Intent(Settings.ACTION_NOTIFICATION_HISTORY);















        mStatusBar.startActivity(intent, true, true, Intent.FLAG_ACTIVITY_SINGLE_TOP);















    }