Cherish: Extend Pulse to Ambient Screen [2/2]
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -51,6 +51,7 @@ public class PulseSettings extends SettingsPreferenceFragment implements
|
||||
|
||||
private static final String NAVBAR_PULSE_ENABLED_KEY = "navbar_pulse_enabled";
|
||||
private static final String LOCKSCREEN_PULSE_ENABLED_KEY = "lockscreen_pulse_enabled";
|
||||
private static final String AMBIENT_PULSE_ENABLED_KEY = "ambient_pulse_enabled";
|
||||
private static final String PULSE_SMOOTHING_KEY = "pulse_smoothing_enabled";
|
||||
private static final String PULSE_COLOR_MODE_KEY = "pulse_color_mode";
|
||||
private static final String PULSE_COLOR_MODE_CHOOSER_KEY = "pulse_color_user";
|
||||
@@ -67,6 +68,7 @@ public class PulseSettings extends SettingsPreferenceFragment implements
|
||||
|
||||
private SwitchPreference mNavbarPulse;
|
||||
private SwitchPreference mLockscreenPulse;
|
||||
private SwitchPreference mAmbientPulse;
|
||||
private SwitchPreference mPulseSmoothing;
|
||||
private Preference mRenderMode;
|
||||
private ListPreference mColorModePref;
|
||||
@@ -95,6 +97,12 @@ public class PulseSettings extends SettingsPreferenceFragment implements
|
||||
mLockscreenPulse.setChecked(lockscreenPulse);
|
||||
mLockscreenPulse.setOnPreferenceChangeListener(this);
|
||||
|
||||
mAmbientPulse = (SwitchPreference) findPreference(AMBIENT_PULSE_ENABLED_KEY);
|
||||
boolean ambientPulse = Settings.Secure.getIntForUser(resolver,
|
||||
Settings.Secure.AMBIENT_PULSE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
|
||||
mAmbientPulse.setChecked(ambientPulse);
|
||||
mAmbientPulse.setOnPreferenceChangeListener(this);
|
||||
|
||||
mColorModePref = (ListPreference) findPreference(PULSE_COLOR_MODE_KEY);
|
||||
mColorPickerPref = (ColorPickerPreference) findPreference(PULSE_COLOR_MODE_CHOOSER_KEY);
|
||||
int userColor = Settings.Secure.getInt(getContentResolver(),
|
||||
@@ -131,6 +139,12 @@ public class PulseSettings extends SettingsPreferenceFragment implements
|
||||
Settings.Secure.LOCKSCREEN_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT);
|
||||
updateAllPrefs();
|
||||
return true;
|
||||
} else if (preference == mAmbientPulse) {
|
||||
boolean val = (Boolean) newValue;
|
||||
Settings.Secure.putIntForUser(resolver,
|
||||
Settings.Secure.AMBIENT_PULSE_ENABLED, val ? 1 : 0, UserHandle.USER_CURRENT);
|
||||
updateAllPrefs();
|
||||
return true;
|
||||
} else if (preference == mColorPickerPref) {
|
||||
int value = (Integer) newValue;
|
||||
Settings.Secure.putInt(resolver,
|
||||
@@ -154,9 +168,12 @@ public class PulseSettings extends SettingsPreferenceFragment implements
|
||||
boolean lockscreenPulse = Settings.Secure.getIntForUser(resolver,
|
||||
Settings.Secure.LOCKSCREEN_PULSE_ENABLED, 1, UserHandle.USER_CURRENT) != 0;
|
||||
|
||||
mPulseSmoothing.setEnabled(navbarPulse || lockscreenPulse);
|
||||
boolean ambientPulse = Settings.Secure.getIntForUser(resolver,
|
||||
Settings.Secure.AMBIENT_PULSE_ENABLED, 1, UserHandle.USER_CURRENT) != 0;
|
||||
|
||||
mColorModePref.setEnabled(navbarPulse || lockscreenPulse);
|
||||
mPulseSmoothing.setEnabled(navbarPulse || lockscreenPulse || ambientPulse);
|
||||
|
||||
mColorModePref.setEnabled(navbarPulse || lockscreenPulse || ambientPulse);
|
||||
if (navbarPulse || lockscreenPulse) {
|
||||
int colorMode = Settings.Secure.getIntForUser(resolver,
|
||||
Settings.Secure.PULSE_COLOR_MODE, COLOR_TYPE_LAVALAMP, UserHandle.USER_CURRENT);
|
||||
@@ -166,8 +183,8 @@ public class PulseSettings extends SettingsPreferenceFragment implements
|
||||
mLavaSpeedPref.setEnabled(false);
|
||||
}
|
||||
|
||||
mRenderMode.setEnabled(navbarPulse || lockscreenPulse);
|
||||
if (navbarPulse || lockscreenPulse) {
|
||||
mRenderMode.setEnabled(navbarPulse || lockscreenPulse || ambientPulse);
|
||||
if (navbarPulse || lockscreenPulse || ambientPulse) {
|
||||
int renderMode = Settings.Secure.getIntForUser(resolver,
|
||||
Settings.Secure.PULSE_RENDER_STYLE, RENDER_STYLE_SOLID_LINES, UserHandle.USER_CURRENT);
|
||||
updateRenderCategories(renderMode);
|
||||
|
||||
Reference in New Issue
Block a user