psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SQUASH] Cherish: Force custom doze brightness and pulse brightness configs [2/2]

Browse Source 
* Stallix: Forward port to 11

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
maxwen
2020-12-16 23:34:35 +09:00
committed by Hưng Phan
parent a343e61057
commit ed97aea10a
3 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/cherish_strings.xml
View File

@@ -1186,4 +1186,13 @@
<string name="fod_icon_picker_title">Fingerprint icon</string>
<string name="fod_icon_picker_summary">Choose your favorite fingerprint icon</string>
<string name="fod_icon_picker_footer">In order to add your own icon, select the top left icon and use the OnePlus 6T FP Customizer app to select the icon you want.</string>
<!-- Doze Brightness Config -->
<string name="doze_brightness_category">Doze Brightness Config</string>
<string name="doze_brightness_force_title">Force brightness values</string>
<string name="doze_brightness_force_summary">Use custom brightness values instead of screen brightness</string>
<string name="ambient_pulse_brightness_title">Ambient notification brightness</string>
<string name="ambient_pulse_brightness_summary">Set brightness to use when notifcations are shown</string>
<string name="ambient_doze_brightness_title">Ambient display brightness</string>
<string name="ambient_doze_brightness_summary">Set brightness to use during ambient display on</string>
</resources>

28
res/xml/cherish_settings_misc.xml
View File

@@ -41,6 +41,34 @@
android:title="@string/gaming_mode_title"
android:summary="@string/gaming_mode_summary"
android:defaultValue="false" />
<PreferenceCategory
android:title="@string/doze_brightness_category">
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="doze_brightness_force"
android:title="@string/doze_brightness_force_title"
android:summary="@string/doze_brightness_force_summary"
android:defaultValue="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="ambient_doze_brightness"
android:title="@string/ambient_doze_brightness_title"
android:summary="@string/ambient_doze_brightness_summary"
android:max="255"
android:min="1"
android:persistent="false" />
<com.cherish.settings.preferences.CustomSeekBarPreference
android:key="ambient_pulse_brightness"
android:title="@string/ambient_pulse_brightness_title"
android:summary="@string/ambient_pulse_brightness_summary"
android:max="255"
android:min="1"
android:persistent="false" />
</PreferenceCategory>
<com.cherish.settings.preferences.GlobalSettingSwitchPreference
android:icon="@drawable/ic_plug"

36
src/com/cherish/settings/fragments/MiscSettings.java
View File

@@ -38,13 +38,17 @@ public class MiscSettings extends SettingsPreferenceFragment implements
OnPreferenceChangeListener {
private static final String SMART_PIXELS = "smart_pixels";
private static final String SYSUI_ROUNDED_SIZE = "sysui_rounded_size";
private static final String SYSUI_ROUNDED_SIZE = "sysui_rounded_size";
private static final String SYSUI_ROUNDED_CONTENT_PADDING = "sysui_rounded_content_padding";
private static final String SYSUI_ROUNDED_FWVALS = "sysui_rounded_fwvals";
private static final String KEY_PULSE_BRIGHTNESS = "ambient_pulse_brightness";
private static final String KEY_DOZE_BRIGHTNESS = "ambient_doze_brightness";
private CustomSeekBarPreference mCornerRadius;
private CustomSeekBarPreference mContentPadding;
private SecureSettingSwitchPreference mRoundedFwvals;
private CustomSeekBarPreference mPulseBrightness;
private CustomSeekBarPreference mDozeBrightness;
@Override
public void onCreate(Bundle icicle) {
@@ -86,6 +90,26 @@ public class MiscSettings extends SettingsPreferenceFragment implements
mRoundedFwvals = (SecureSettingSwitchPreference) findPreference(SYSUI_ROUNDED_FWVALS);
mRoundedFwvals.setOnPreferenceChangeListener(this);
int defaultDoze = getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessDoze);
int defaultPulse = getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessPulse);
if (defaultPulse == -1) {
defaultPulse = defaultDoze;
}
mPulseBrightness = (CustomSeekBarPreference) findPreference(KEY_PULSE_BRIGHTNESS);
int value = Settings.System.getInt(getContentResolver(),
Settings.System.PULSE_BRIGHTNESS, defaultPulse);
mPulseBrightness.setValue(value);
mPulseBrightness.setOnPreferenceChangeListener(this);
mDozeBrightness = (CustomSeekBarPreference) findPreference(KEY_DOZE_BRIGHTNESS);
value = Settings.System.getInt(getContentResolver(),
Settings.System.DOZE_BRIGHTNESS, defaultDoze);
mDozeBrightness.setValue(value);
mDozeBrightness.setOnPreferenceChangeListener(this);
}
private void updateSmartPixelsPreference() {
@@ -112,6 +136,16 @@ public class MiscSettings extends SettingsPreferenceFragment implements
} else if (preference == mRoundedFwvals) {
restoreCorners();
return true;
} else if (preference == mPulseBrightness) {
int value = (Integer) objValue;
Settings.System.putInt(getContentResolver(),
Settings.System.PULSE_BRIGHTNESS, value);
return true;
} else if (preference == mDozeBrightness) {
int value = (Integer) objValue;
Settings.System.putInt(getContentResolver(),
Settings.System.DOZE_BRIGHTNESS, value);
return true;
}
return false;
}