OmniGears: cleanup
-validate power menu entries with global action list
-use SeekBarPreference for ambient display brightness
-set values from PowerManager for brightness seekbars
-rework button backlight page
Change-Id: Id5375684d99942cb350d917bc45b587dd608b1c7
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 32c28fd..5d7a224 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -179,17 +179,14 @@
<string name="statusbar_battery_charging_color_enable_summary"></string>
<string name="battery_enable_title">Show battery</string>
- <string name="button_brightness_title">Brightness</string>
- <string name="button_brightness_summary">Button backlight brightness</string>
+ <string name="button_backlight_title">Button backlight</string>
<string name="button_timeout_title">Backlight timeout</string>
<string name="button_timeout_summary">Disabled on value 0</string>
- <string name="button_no_brightness">Dark mode</string>
- <string name="button_no_brightness_summary">Don\'t set button brightness</string>
<string name="button_link_brightness">Link to screen</string>
<string name="button_link_brightness_summary">Use screen brightness level</string>
<string name="button_manual_brightness">Brightness level</string>
- <string name="dialog_manual_brightness_title">Brightness level</string>
<string name="unit_sec">sec</string>
+ <string name="button_backlight_enable_title">Enable</string>
<string name="navigation_bar_show_title">Show navigation bar</string>
<string name="navigation_bar_show_summary">Force enable navigation bar</string>
diff --git a/res/xml/ambient_settings.xml b/res/xml/ambient_settings.xml
index 7c61091..729c881 100644
--- a/res/xml/ambient_settings.xml
+++ b/res/xml/ambient_settings.xml
@@ -54,9 +54,11 @@
android:defaultValue="true"
android:dependency="doze_overwrite_value" />
- <Preference
+ <com.android.settings.preference.SeekBarPreference
android:key="doze_brightness_level"
android:title="@string/doze_brightness_level_title"
+ android:max="255"
+ settings:min="0"
android:persistent="false"
android:dependency="doze_overwrite_value" />
diff --git a/res/xml/button_brightness_settings.xml b/res/xml/button_brightness_settings.xml
index 941552c..68288ee 100644
--- a/res/xml/button_brightness_settings.xml
+++ b/res/xml/button_brightness_settings.xml
@@ -19,22 +19,24 @@
android:title="@string/button_brightness_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
- <com.android.settings.preference.SeekBarPreference
- android:key="button_manual_brightness_new"
- android:title="@string/button_manual_brightness"
- android:max="255"
- settings:min="0"
- android:persistent="false" />
- <CheckBoxPreference
- android:key="button_no_brightness"
- android:title="@string/button_no_brightness"
- android:summary="@string/button_no_brightness_summary"
+ <SwitchPreference
+ android:key="button_backlight_enable"
+ android:title="@string/button_backlight_enable_title"
android:persistent="false"/>
<CheckBoxPreference
android:key="button_link_brightness"
android:title="@string/button_link_brightness"
android:summary="@string/button_link_brightness_summary"
- android:persistent="false"/>
+ android:persistent="false"
+ android:dependency="button_backlight_enable"
+ android:disableDependentsState="true" />
+ <com.android.settings.preference.SeekBarPreference
+ android:key="button_manual_brightness_new"
+ android:title="@string/button_manual_brightness"
+ android:max="255"
+ settings:min="0"
+ android:persistent="false"
+ android:dependency="button_link_brightness" />
<com.android.settings.preference.SeekBarPreference
android:key="button_timeout"
android:title="@string/button_timeout_title"
@@ -43,5 +45,6 @@
settings:min="0"
settings:unitsLeft=""
settings:unitsRight="@string/unit_sec"
- android:persistent="false" />
+ android:persistent="false"
+ android:dependency="button_backlight_enable" />
</PreferenceScreen>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 4a5e9dd..9aec1fb 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -102,8 +102,7 @@
<PreferenceScreen
android:key="button_brightness"
- android:title="@string/button_brightness_title"
- android:summary="@string/button_brightness_summary"
+ android:title="@string/button_backlight_title"
android:fragment="org.omnirom.omnigears.brightness.ButtonBrightnessSettings" />
<!--<SwitchPreference