Cherish:Brightness slider options [2/2]

Change-Id: I144b7b7183bf9434fc8e0fc65a1e4ba1b2d658e1
Signed-off-by: DennySPb <dennyspb@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Jesse Chan
2020-10-13 15:22:36 +03:00
committed by Hưng Phan
parent 69a604b199
commit bab44d341a
3 changed files with 36 additions and 11 deletions

View File

@@ -1085,4 +1085,16 @@
<item>3</item>
<item>4</item>
</string-array>
<string-array name="qs_show_brightness_slider_entries" translatable="false">
<item>@string/qs_show_brightness_slider_show_never</item>
<item>@string/qs_show_brightness_slider_show_expanded</item>
<item>@string/qs_show_brightness_slider_show_always</item>
</string-array>
<string-array name="qs_show_brightness_slider_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
</resources>

View File

@@ -1000,4 +1000,13 @@
<string name="ui_style_rectangle">Rectangle</string>
<string name="ui_style_round_large">Round Large</string>
<string name="ui_style_round_medium">Round Medium</string>
<!-- Quick Settings brightness slider -->
<string name="qs_show_brightness_slider_title">Brightness slider</string>
<string name="qs_show_brightness_slider_summary">Show a brightness slider in the quick settings panel</string>
<string name="qs_show_auto_brightness_title">Autobrightness icon</string>
<string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
<string name="qs_show_brightness_slider_show_never">Never show</string>
<string name="qs_show_brightness_slider_show_expanded">Show when expanded</string>
<string name="qs_show_brightness_slider_show_always">Show always</string>
</resources>

View File

@@ -17,7 +17,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/quicksettings_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<<<<<<< HEAD
<PreferenceCategory
android:title="@string/qs_category">
@@ -68,16 +67,21 @@
android:entryValues="@array/qs_datausage_values"
android:defaultValue="0" />
<!-- QS brightness slider -->
<com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
android:key="qs_show_brightness"
android:icon="@drawable/ic_brightness"
android:title="@string/qs_show_brightness_title"
android:summary="@string/qs_show_brightness_summary"
android:fragment="com.cherish.settings.fragments.BrightnessSliderSettings"
android:defaultValue="true" />
=======
>>>>>>> parent of 31e425c4 (Cherish:Add pref for qs brightness slider position [2/2])
<com.cherish.settings.preferences.SecureSettingListPreference
android:key="qs_show_brightness_slider"
android:title="@string/qs_show_brightness_slider_title"
android:summary="%s"
android:dialogTitle="@string/qs_show_brightness_slider_title"
android:entries="@array/qs_show_brightness_slider_entries"
android:entryValues="@array/qs_show_brightness_slider_values"
android:defaultValue="1" />
<com.cherish.settings.preferences.SecureSettingSwitchPreference
android:key="qs_show_auto_brightness"
android:icon="@drawable/ic_brightness"
android:title="@string/qs_show_auto_brightness_title"
android:summary="@string/qs_show_auto_brightness_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_brightness_control"