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

Set click listeners on displayPreference

Browse Source 
Cherry-picked from pi-dev
Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Fixes: 79728671
This commit is contained in:
Beverly
2018-05-18 14:33:36 -04:00
parent 95c8c89fee
commit 14a6856d37
4 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
View File

@@ -16,9 +16,8 @@
package com.android.settings.notification;
import android.app.NotificationManager.Policy;
import android.app.NotificationManager;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -30,10 +29,13 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
public class ZenModeVisEffectsCustomPreferenceController
extends AbstractZenModePreferenceController {
protected static final int INTERRUPTIVE_EFFECTS = Policy.SUPPRESSED_EFFECT_AMBIENT
| Policy.SUPPRESSED_EFFECT_PEEK
| Policy.SUPPRESSED_EFFECT_LIGHTS
| Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
private ZenCustomRadioButtonPreference mPreference;
protected static final int INTERRUPTIVE_EFFECTS =
NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT
| NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK
| NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS
| NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
public ZenModeVisEffectsCustomPreferenceController(Context context, Lifecycle lifecycle,
String key) {
@@ -46,25 +48,31 @@ public class ZenModeVisEffectsCustomPreferenceController
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (ZenCustomRadioButtonPreference) screen.findPreference(getPreferenceKey());
ZenCustomRadioButtonPreference pref = (ZenCustomRadioButtonPreference) preference;
pref.setChecked(areCustomOptionsSelected());
pref.setOnGearClickListener(p -> {
mPreference.setOnGearClickListener(p -> {
launchCustomSettings();
});
pref.setOnRadioButtonClickListener(p -> {
mPreference.setOnRadioButtonClickListener(p -> {
launchCustomSettings();
});
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
mPreference.setChecked(areCustomOptionsSelected());
}
protected boolean areCustomOptionsSelected() {
boolean allEffectsSuppressed =
Policy.areAllVisualEffectsSuppressed(mBackend.mPolicy.suppressedVisualEffects);
NotificationManager.Policy.areAllVisualEffectsSuppressed(
mBackend.mPolicy.suppressedVisualEffects);
boolean noEffectsSuppressed = mBackend.mPolicy.suppressedVisualEffects == 0;
return !(allEffectsSuppressed || noEffectsSuppressed);