commit c459d6299711039b1abacd037f4d4d4e069fac84
author Stefan Berger <s.berger81@gmail.com> Sat Jun 16 12:51:37 2018 +0200
committer Stefan Berger <s.berger81@gmail.com> Sat Jun 16 14:21:42 2018 +0200
tree 89ff705f0479e8ecc788fcf9fd8ff79ff3883b72
parent a8eca671cbae6197a9a34d1496ea0bf1aaef96cb

[2/2] OG: Introduce attribute for color picker enablement

Get rid of the dependency on multi color led overlay value
to allow enabling the color picker for all devices.

Change-Id: I835b1311d4fbced96d0b3cad12dcb6b6437d11c3

res/xml/omni_clock_settings.xml

diff --git a/res/xml/omni_clock_settings.xml b/res/xml/omni_clock_settings.xml
index 889839e..344a198 100644
--- a/res/xml/omni_clock_settings.xml
+++ b/res/xml/omni_clock_settings.xml
@@ -40,36 +40,42 @@
     <org.omnirom.omnilib.preference.ColorSelectPreference
         android:key="bg_color"
         android:persistent="false"
+        settings:multiColor="true"
         settings:withAlpha="true"
         android:title="@string/omni_clock_bg_color_title" />
 
     <org.omnirom.omnilib.preference.ColorSelectPreference
         android:key="border_color"
         android:persistent="false"
+        settings:multiColor="true"
         settings:withAlpha="true"
         android:title="@string/omni_clock_border_color_title" />
 
     <org.omnirom.omnilib.preference.ColorSelectPreference
         android:key="hour_color"
         android:persistent="false"
+        settings:multiColor="true"
         settings:withAlpha="true"
         android:title="@string/omni_clock_hour_color_title" />
 
     <org.omnirom.omnilib.preference.ColorSelectPreference
         android:key="minute_color"
         android:persistent="false"
+        settings:multiColor="true"
         settings:withAlpha="true"
         android:title="@string/omni_clock_minute_color_title" />
 
     <org.omnirom.omnilib.preference.ColorSelectPreference
         android:key="text_color"
         android:persistent="false"
+        settings:multiColor="true"
         settings:withAlpha="true"
         android:title="@string/omni_clock_text_color_title" />
 
     <org.omnirom.omnilib.preference.ColorSelectPreference
         android:key="accent_color"
         android:persistent="false"
+        settings:multiColor="true"
         settings:withAlpha="true"
         android:title="@string/omni_clock_accent_color_title" />
 </PreferenceScreen>

res/xml/statusbar_battery_settings.xml

diff --git a/res/xml/statusbar_battery_settings.xml b/res/xml/statusbar_battery_settings.xml
index 778329c..6027872 100644
--- a/res/xml/statusbar_battery_settings.xml
+++ b/res/xml/statusbar_battery_settings.xml
@@ -15,6 +15,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
             android:title="@string/battery_title"
             android:key="statusbar_battery">
 
@@ -68,6 +69,8 @@
                 android:defaultValue="false"/>
             <org.omnirom.omnilib.preference.ColorSelectPreference
                 android:key="statusbar_battery_charging_color"
+                settings:multiColor="true"
+                settings:withAlpha="true"
                 android:title="@string/statusbar_battery_charging_color_title"
                 android:persistent="false"
                 android:dependency ="statusbar_battery_charging_color_enable"/>