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

Commit f64ce9e5 authored by Chloris Kuo's avatar Chloris Kuo
Browse files

Add flag to reset notification channel importance

Add a button in development option to unlock user previously changed
notification importance and allow NAS to change the importance

Test: make RunSettingsRoboTests
Change-Id: I55b5349d6a17a383888c59b9126832c2fb8c58a0
parent 6f5b308d
Loading
Loading
Loading
Loading
+33 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2020 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <Button
        android:id="@+id/reset_importance_button"
        style="@style/ActionPrimaryButton"
        android:layout_marginStart="@dimen/screen_margin_sides"
        android:text="@string/asst_importance_reset_title"
        android:layout_gravity="start"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"/>

</LinearLayout>
 No newline at end of file
+6 −0
Original line number Diff line number Diff line
@@ -8257,6 +8257,12 @@
    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
    <string name="asst_feedback_indicator_summary">Indicate adjustments made to notifications and show the option to provide feedback to the system</string>
    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
    <string name="asst_importance_reset_title">Reset notification importance</string>
    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
    <string name="asst_importance_reset_summary">Reset user changed importance settings and allow notification assistant to prioritize</string>
    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
    <string name="asst_capabilities_actions_replies_title">Suggested actions and replies</string>
+7 −0
Original line number Diff line number Diff line
@@ -610,6 +610,13 @@
            android:title="@string/asst_feedback_indicator_title"
            settings:controller="com.android.settings.notification.AssistantFeedbackPreferenceController" />

        <com.android.settingslib.widget.LayoutPreference
            android:key="asst_importance_reset"
            android:title="@string/asst_importance_reset_title"
            android:selectable="false"
            android:layout="@layout/reset_importance_button"
            settings:controller="com.android.settings.notification.ImportanceResetPreferenceController" />

        <Preference
            android:key="inactive_apps"
            android:title="@string/inactive_apps_title"
+68 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2020 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.settings.notification;

import android.content.Context;
import android.view.View;
import android.widget.Button;

import androidx.preference.Preference;

import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.LayoutPreference;

public class ImportanceResetPreferenceController extends BasePreferenceController implements
        View.OnClickListener {

    public static final String KEY = "asst_importance_reset";
    private static final String TAG = "ResetImportanceButton";

    private NotificationBackend mBackend;
    private Button mButton;

    public ImportanceResetPreferenceController(Context context, String key) {
        super(context, key);
        mBackend = new NotificationBackend();
    }

    @Override
    public String getPreferenceKey() {
        return KEY;
    }

    @Override
    public void updateState(Preference preference) {
        super.updateState(preference);

        mButton = ((LayoutPreference) preference)
                .findViewById(R.id.reset_importance_button);
        mButton.setOnClickListener(this);
    }

    @Override
    public void onClick(View v) {
        mBackend.resetNotificationImportance();
    }

    @Override
    public int getAvailabilityStatus() {
        return AVAILABLE;
    }

}
+8 −0
Original line number Diff line number Diff line
@@ -585,6 +585,14 @@ public class NotificationBackend {
        sm.requestPinShortcut(shortcutInfo, null);
    }

    public void resetNotificationImportance() {
        try {
            sINM.unlockAllNotificationChannels();
        } catch (Exception e) {
            Log.w(TAG, "Error calling NoMan", e);
        }
    }

    /**
     * NotificationsSentState contains how often an app sends notifications and how recently it sent
     * one.
Loading