PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I081a35c8,I8a84f688,I60b64a0c into main

Browse Source 
* changes:
  Clean un-used code for notification cool down
  Add tests for updating Settings Page for Avalanche Suppression
  Update Settings Page for Avalanche Suppression
This commit is contained in:
Yining Liu
2024-05-28 15:55:14 +00:00
committed by Android (Google) Code Review
parent 0dca9f78c5 3d0640985b
commit 3e46f1f1c9
9 changed files with 213 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
View File

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

114
src/com/android/settings/notification/PoliteNotificationFilterController.java
View File

@@ -1,114 +0,0 @@
/*
* 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;
}
}

37
src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java → src/com/android/settings/notification/PoliteNotificationGlobalPreferenceController.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 The Android Open Source Project
* Copyright (C) 2024 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.
@@ -16,51 +16,48 @@
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 androidx.annotation.NonNull;
import com.android.server.notification.Flags;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
/**
* Controls the toggle that determines whether notifications
* should only vibrate (no sound) when the device is unlocked.
*/
public class PoliteNotifVibrateUnlockedToggleController extends TogglePreferenceController {
public class PoliteNotificationGlobalPreferenceController extends
SettingsMainSwitchPreferenceController {
public PoliteNotifVibrateUnlockedToggleController(Context context, String preferenceKey) {
public static final int ON = 1;
public static final int OFF = 0;
public PoliteNotificationGlobalPreferenceController(@NonNull Context context,
@NonNull 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;
if (Flags.politeNotifications()) {
return AVAILABLE;
}
return mContext.getSystemService(Vibrator.class).hasVibrator() ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
return CONDITIONALLY_UNAVAILABLE;
}
@Override
public boolean isChecked() {
return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF) != OFF;
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == ON;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, (isChecked ? ON : OFF));
Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (isChecked ? ON : OFF));
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_accessibility;
// not needed since it's not sliceable
return NO_RES;
}
}