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

Update Priority Modes segment summary

Browse Source 
* Display active modes regardless of DND status
* Only consider actually automatic rules for the "x rules can activate automatically" text.
* Also removed the duplicate settings observer in favor of ZenSettingsObserver.

Bug: 355615361
Test: atest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I39acb785e7b27c95ed664261640c42032acca9d1
This commit is contained in:
Matías Hernández
2024-08-06 19:45:57 +02:00
parent 55102216e1
commit f0952bef52
4 changed files with 133 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/com/android/settings/notification/modes/ZenModesLinkPreferenceController.java
View File

@@ -17,35 +17,31 @@
package com.android.settings.notification.modes;
import android.app.Flags;
import android.app.NotificationManager;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.notification.modes.ZenModesBackend;
public class ZenModesLinkPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnResume, OnPause {
implements LifecycleObserver, OnStart, OnStop {
private SettingObserver mSettingObserver;
private ZenModeSummaryHelper mSummaryBuilder;
private NotificationManager mNm;
private final ZenModesBackend mBackend;
private final ZenSettingsObserver mSettingObserver;
private final ZenModeSummaryHelper mSummaryBuilder;
private Preference mPreference;
public ZenModesLinkPreferenceController(Context context, String key) {
super(context, key);
mBackend = ZenModesBackend.getInstance(context);
mSummaryBuilder = new ZenModeSummaryHelper(context, ZenHelperBackend.getInstance(context));
mNm = mContext.getSystemService(NotificationManager.class);
mSettingObserver = new ZenSettingsObserver(context, this::onZenSettingsChanged);
}
@Override
@@ -57,64 +53,31 @@ public class ZenModesLinkPreferenceController extends BasePreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
Preference preference = screen.findPreference(getPreferenceKey());
mSettingObserver = new SettingObserver(preference);
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public void onResume() {
public void onStart() {
if (mSettingObserver != null) {
mSettingObserver.register(mContext.getContentResolver());
mSettingObserver.register();
}
}
@Override
public void onPause() {
if (mSettingObserver != null) {
mSettingObserver.unregister(mContext.getContentResolver());
private void onZenSettingsChanged() {
if (mPreference != null) {
updateState(mPreference);
}
}
@Override
public void updateState(Preference preference) {
preference.setSummary(mSummaryBuilder.getSoundSummary(
Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_MODE,
Settings.Global.ZEN_MODE_OFF),
mNm.getZenModeConfig()));
preference.setSummary(mSummaryBuilder.getModesSummary(mBackend.getModes()));
}
class SettingObserver extends ContentObserver {
private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
Settings.Global.ZEN_MODE_CONFIG_ETAG);
private final Preference mPreference;
public SettingObserver(Preference preference) {
super(new Handler());
mPreference = preference;
}
public void register(ContentResolver cr) {
cr.registerContentObserver(ZEN_MODE_URI, false, this, UserHandle.USER_ALL);
cr.registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this, UserHandle.USER_ALL);
}
public void unregister(ContentResolver cr) {
cr.unregisterContentObserver(this);
}
@Override
public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri);
if (ZEN_MODE_URI.equals(uri)) {
updateState(mPreference);
}
if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
updateState(mPreference);
}
@Override
public void onStop() {
if (mSettingObserver != null) {
mSettingObserver.unregister();
}
}
}