Clean un-used code for notification cool down (3d064098) · Commits · e / os / android_packages_apps_Settings

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -8683,14 +8683,6 @@
		<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_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_work">Apply to work profiles</string>
		<string name="notification_polite_work_summary">Apply to work profile apps</string>

res/xml/polite_notifications_settings.xml

+0 −16

Original line number	Diff line number	Diff line
		@@ -17,24 +17,8 @@

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		xmlns:app="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"/>

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

deleted100644 → 0

+0 −66

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.os.Vibrator;
		import android.provider.Settings;

		import com.android.server.notification.Flags;
		import com.android.settings.R;
		import com.android.settings.core.TogglePreferenceController;

		/**
		* Controls the toggle that determines whether notifications
		* should only vibrate (no sound) when the device is unlocked.
		*/
		public class PoliteNotifVibrateUnlockedToggleController extends TogglePreferenceController {

		public PoliteNotifVibrateUnlockedToggleController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		}

		@Override
		public int getAvailabilityStatus() {
		// TODO: b/291897570 - remove this when the feature flag is removed!
		if (!Flags.politeNotifications() \|\| !Flags.vibrateWhileUnlocked()) {
		return CONDITIONALLY_UNAVAILABLE;
		}
		return mContext.getSystemService(Vibrator.class).hasVibrator() ? AVAILABLE
		: UNSUPPORTED_ON_DEVICE;
		}

		@Override
		public boolean isChecked() {
		return Settings.System.getInt(mContext.getContentResolver(),
		Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF) != OFF;
		}

		@Override
		public boolean setChecked(boolean isChecked) {
		return Settings.System.putInt(mContext.getContentResolver(),
		Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, (isChecked ? ON : OFF));
		}

		@Override
		public int getSliceHighlightMenuRes() {
		return R.string.menu_key_accessibility;
		}
		}

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;
		}
		}