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

Commit 3e46f1f1 authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge changes I081a35c8,I8a84f688,I60b64a0c into main 

* changes:
  Clean un-used code for notification cool down
  Add tests for updating Settings Page for Avalanche Suppression
  Update Settings Page for Avalanche Suppression
parents 0dca9f78 3d064098

res/values/arrays.xml

+0 −14
Original line number Diff line number Diff line
@@ -1511,20 +1511,6 @@ 
        <item>fr</item> <!-- French -->

    </string-array>



    <!-- Values for notification cooldown -->

    <string-array name="notification_polite_options">

        <item>@string/notification_polite_all_apps</item>

        <item>@string/notification_polite_conversations</item>

        <item>@string/notification_polite_disabled</item>

    </string-array>



    <!-- Values for notification cooldown -->

    <string-array name="notification_polite_options_values" translatable="false">

        <item>0</item>

        <item>1</item>

        <item>2</item>

    </string-array>



    <!-- Entries for private space auto lock option -->

    <string-array name="private_space_auto_lock_options">

        <item>@string/private_space_auto_lock_every_time</item>

res/values/strings.xml

+4 −10
Original line number Diff line number Diff line
@@ -8704,17 +8704,11 @@ 
    <string name="notif_listener_more_settings_desc">More settings are available inside this app</string>









    <!-- Title for Polite Notifications setting  [CHAR LIMIT=30]-->









    <string name="notification_polite_title">Notification cooldown</string>









    <string name="notification_polite_all_apps">Apply cooldown to all notifications</string>









    <string name="notification_polite_all_apps_summary">Gradually lower the notification volume when you get many successive notifications from the same app</string>









    <string name="notification_polite_conversations">Apply cooldown to conversations</string>









    <string name="notification_polite_conversations_summary">Gradually lower the notification volume when you get many messages from the same chat within a short period of time</string>









    <string name="notification_polite_disabled">Don\'t use notification cooldown</string>









    <string name="notification_polite_disabled_summary">Never lower notification volume, regardless of the amount of successive notifications from the same app</string>









    <string name="notification_polite_vibrate_unlocked">Vibrate when unlocked</string>









    <string name="notification_polite_vibrate_unlocked_summary">Only vibrate when screen is unlocked</string>









    <string name="notification_polite_title">Cooldown</string>









    <string name="notification_polite_main_control_title">Use Cooldown</string>









    <string name="notification_polite_description">When you get many notifications within a short time span, your device will minimize sound interruptions and pop-ups on the screen. Calls, alarms, and priority conversations will still alert as notmal, and all delivered notifications are easy to find in the Shade.</string>









    <string name="notification_polite_work">Apply to work profiles</string>









    <string name="notification_polite_work_summary">Apply the notification cooldown settings from your personal profile to your work profile</string>









    <string name="notification_polite_work_summary">Apply to work profile apps</string>

























    <!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->

























res/xml/polite_notifications_settings.xml



+17
−14






























Original line number
Diff line number
Diff line







@@ -19,20 +19,23 @@







    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:title="@string/notification_polite_title">



















    <com.android.settings.RestrictedListPreference









        android:key="polite_notifications_pref_dlg"









        android:persistent="false"









        android:title="@string/notification_polite_title"









        android:entries="@array/notification_polite_options"









        android:entryValues="@array/notification_polite_options_values"









        settings:controller="com.android.settings.notification.PoliteNotificationFilterController"/>



















    <SwitchPreferenceCompat









        android:key="notification_polite_vibrate_unlocked"









        android:persistent="false"









        android:title="@string/notification_polite_vibrate_unlocked"









        android:summary="@string/notification_polite_vibrate_unlocked_summary"









        settings:controller="com.android.settings.notification.PoliteNotifVibrateUnlockedToggleController" />









    <com.android.settingslib.widget.TopIntroPreference









        android:key="polite_notification_desc"









        android:title="@string/notification_polite_description"/>



















<!--    TODO(b/330606963): add the illustration back when animation is ready-->









<!--    <com.android.settingslib.widget.IllustrationPreference-->









<!--        android:key="bubbles_illustration"-->









<!--        settings:searchable="false"-->









<!--        android:selectable="false"-->









<!--        app:lottie_rawRes="@raw/lottie_bubbles"-->









<!--        app:lottie_cacheComposition="false"-->









<!--        settings:dynamicColor="true" />-->



















    <com.android.settingslib.widget.MainSwitchPreference









        android:key="polite_notification_global_pref"









        android:title="@string/notification_polite_main_control_title"









        settings:controller="com.android.settings.notification.PoliteNotificationGlobalPreferenceController" />



















    <SwitchPreferenceCompat









        android:key="notification_polite_work_profile"
































src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java



+67
−6






























Original line number
Diff line number
Diff line







@@ -16,29 +16,52 @@

















package com.android.settings.notification;



















import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;









import static com.android.settings.accessibility.AccessibilityUtil.State.ON;









import static com.android.settings.notification.PoliteNotificationGlobalPreferenceController.ON;









import static com.android.settings.notification.PoliteNotificationGlobalPreferenceController.OFF;



















import android.content.ContentResolver;









import android.content.Context;









import android.database.ContentObserver;









import android.net.Uri;









import android.os.Handler;









import android.os.Looper;









import android.os.UserHandle;









import android.os.UserManager;









import android.provider.Settings;



















import androidx.annotation.NonNull;









import androidx.annotation.Nullable;









import androidx.annotation.VisibleForTesting;









import androidx.lifecycle.Lifecycle;









import androidx.lifecycle.LifecycleEventObserver;









import androidx.lifecycle.LifecycleOwner;









import androidx.preference.Preference;









import androidx.preference.PreferenceScreen;



















import com.android.server.notification.Flags;









import com.android.settings.R;









import com.android.settings.core.TogglePreferenceController;



















/**









 * Controls the toggle that determines whether notification cooldown









 * should apply to work profiles.









 */









public class PoliteNotifWorkProfileToggleController extends TogglePreferenceController {









public class PoliteNotifWorkProfileToggleController extends TogglePreferenceController implements









        LifecycleEventObserver {



















    private final int mManagedProfileId;









    private Preference mPreference;









    private final ContentResolver mContentResolver;



















    public PoliteNotifWorkProfileToggleController(Context context, String preferenceKey) {









    final ContentObserver mContentObserver = new ContentObserver(









            new Handler(Looper.getMainLooper())) {









        @Override









        public void onChange(boolean selfChange, @Nullable Uri uri) {









            updateState(mPreference);









        }









    };



















    public PoliteNotifWorkProfileToggleController(@NonNull Context context,









            @NonNull String preferenceKey) {









        this(context, preferenceKey, new AudioHelper(context));









    }


















@@ -47,6 +70,25 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont







                AudioHelper helper) {









        super(context, preferenceKey);









        mManagedProfileId = helper.getManagedProfileId(UserManager.get(mContext));









        mContentResolver = context.getContentResolver();









    }



















    @Override









    public void displayPreference(@NonNull PreferenceScreen screen) {









        super.displayPreference(screen);









        mPreference = screen.findPreference(getPreferenceKey());









    }



















    @Override









    public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,









            @NonNull Lifecycle.Event event) {









        if (event == Lifecycle.Event.ON_RESUME) {









            mContentResolver.registerContentObserver(









                    Settings.System.getUriFor(Settings.System.NOTIFICATION_COOLDOWN_ENABLED),









                    /* notifyForDescendants= */ false, mContentObserver);









        } else if (event == Lifecycle.Event.ON_PAUSE) {









            mContentResolver.unregisterContentObserver(mContentObserver);









        }









    }



















    @Override








@@ -56,11 +98,18 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont







            return CONDITIONALLY_UNAVAILABLE;









        }



















        if (!isCoolDownEnabledForPrimary()) {









            return CONDITIONALLY_UNAVAILABLE;









        }



















        return (mManagedProfileId != UserHandle.USER_NULL) ? AVAILABLE : DISABLED_FOR_USER;









    }



















    @Override









    public boolean isChecked() {









        if (!isCoolDownEnabledForPrimary()) {









            return false;









        }









        return Settings.System.getIntForUser(mContext.getContentResolver(),









                Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON, mManagedProfileId) != OFF;









    }








@@ -74,6 +123,18 @@ public class PoliteNotifWorkProfileToggleController extends TogglePreferenceCont

















    @Override









    public int getSliceHighlightMenuRes() {









        return R.string.menu_key_accessibility;









        // not needed since it's not sliceable









        return NO_RES;









    }



















    @Override









    public void updateState(@Nullable Preference preference) {









        if (preference == null) return;









        preference.setVisible(isAvailable());









    }



















    private boolean isCoolDownEnabledForPrimary() {









        return Settings.System.getInt(mContext.getContentResolver(),









                Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == ON;









    }









}
























src/com/android/settings/notification/PoliteNotificationFilterController.java
deleted100644 → 0



+0
−114






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2023 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 static com.android.settings.accessibility.AccessibilityUtil.State.OFF;









import static com.android.settings.accessibility.AccessibilityUtil.State.ON;



















import android.content.Context;









import android.provider.Settings;









import android.util.Log;



















import androidx.preference.ListPreference;









import androidx.preference.Preference;



















import com.android.server.notification.Flags;









import com.android.settings.R;









import com.android.settings.core.BasePreferenceController;









import com.android.settings.core.PreferenceControllerMixin;





























/**









 * Controls whether polite notifications are enabled and apply to all apps or just to conversations.









 */









public class PoliteNotificationFilterController extends BasePreferenceController









        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {









    static final String TAG = "PoliteNotificationFilterController";



















    private static final int POLITE_NOTIFICATIONS_ALL = 0;









    private static final int POLITE_NOTIFICATIONS_CONVERSATIONS = 1;









    private static final int POLITE_NOTIFICATIONS_DISABLED = 2;



















    public PoliteNotificationFilterController(Context context, String key) {









        super(context, key);









    }



















    @Override









    public int getAvailabilityStatus() {









        // TODO: b/291897570 - remove this when the feature flag is removed!









        return Flags.politeNotifications() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;









    }



















    @Override









    public void updateState(Preference preference) {









        super.updateState(preference);









        final ListPreference pref = (ListPreference) preference;



















        if (isPoliteNotifDisabled()) {









            pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_DISABLED));









        } else if (shouldApplyForAllApps()) {









            pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_ALL));









        } else {









            pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_CONVERSATIONS));









        }









    }



















    @Override









    public CharSequence getSummary() {









        if (isPoliteNotifDisabled()) {









            return mContext.getString(R.string.notification_polite_disabled_summary);









        }









        if (shouldApplyForAllApps()) {









            return mContext.getString(R.string.notification_polite_all_apps_summary);









        } else {









            return mContext.getString(R.string.notification_polite_conversations_summary);









        }









    }



















    @Override









    public boolean onPreferenceChange(Preference preference, Object newValue) {









        final int prefValue = Integer.parseInt((String) newValue);









        if (prefValue == POLITE_NOTIFICATIONS_ALL) {









            Settings.System.putInt(mContext.getContentResolver(),









                    Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);









            Settings.System.putInt(mContext.getContentResolver(),









                    Settings.System.NOTIFICATION_COOLDOWN_ALL, ON);









        } else if (prefValue == POLITE_NOTIFICATIONS_CONVERSATIONS) {









            Settings.System.putInt(mContext.getContentResolver(),









                    Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);









            Settings.System.putInt(mContext.getContentResolver(),









                    Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF);









        } else if (prefValue == POLITE_NOTIFICATIONS_DISABLED) {









            Settings.System.putInt(mContext.getContentResolver(),









                    Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF);









        } else {









            Log.e(TAG, "Unexpected preference value: " + prefValue);









        }









        refreshSummary(preference);









        return true;









    }



















    private boolean isPoliteNotifDisabled() {









        return Settings.System.getInt(mContext.getContentResolver(),









                Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == OFF;









    }



















    private boolean shouldApplyForAllApps() {









        return Settings.System.getInt(mContext.getContentResolver(),









                Settings.System.NOTIFICATION_COOLDOWN_ALL, ON) != OFF;









    }









}