Move individual settings to watchface configuration...

wear/src/main/res/xml/preferences.xml

@@ -18,12 +18,12 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="false"
         android:key="show_date"
         android:title="@string/pref_show_date"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on" />
+        app:wear_iconOn="@drawable/settings_on" />-->
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -109,13 +109,13 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="true"
         android:key="dark"
         android:summary="Dark theme"
         android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on"/>  -->
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -125,13 +125,13 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="false"
         android:key="match_divider"
         android:summary="Status bar divider background matches watchface background"
         android:title="@string/pref_matching_divider"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on"/> -->
 
     <ListPreference
         android:defaultValue="3"
@@ -149,45 +149,45 @@
         android:summary="Input Design"
         android:title="@string/pref_input_design" />
 
-    <ListPreference
+    <!--<ListPreference
         android:defaultValue="2"
         android:entries="@array/delta_granularity"
         android:entryValues="@array/delta_granularity_values"
         android:key="delta_granularity"
         android:summary="Delta Granularity (Steampunk)"
-        android:title="@string/pref_delta_granularity" />
+        android:title="@string/pref_delta_granularity" />-->
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="false"
         android:key="showBigNumbers"
         android:summary="Big numbers. (Circle WF)"
         android:title="@string/pref_big_numbers"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on"/>-->
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="false"
         android:key="showRingHistory"
         android:summary="Graphical history. (Circle WF)"
         android:title="@string/pref_ring_history"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on" />
+        app:wear_iconOn="@drawable/settings_on" />-->
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="true"
         android:key="softRingHistory"
         android:summary="Less eyecandy. (Circle WF)"
         android:title="@string/pref_light_ring_history"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on"/>-->
 
-    <CheckBoxPreference
+    <!--<CheckBoxPreference
         android:defaultValue="true"
         android:key="animation"
         android:summary="Animations. (Circle WF)"
         android:title="@string/pref_animations"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on"/>-->
 
     <CheckBoxPreference
         android:defaultValue="true"

wear/src/main/res/xml/watch_face_configuration_bigchart.xml

@@ -3,7 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="@string/pref_dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
     <CheckBoxPreference
         android:key="vibrate_Hourly"

wear/src/main/res/xml/watch_face_configuration_circle.xml

@@ -2,7 +2,45 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="@string/pref_dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="showBigNumbers"
+        android:summary="Big numbers. (Circle WF)"
+        android:title="@string/pref_big_numbers"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="showRingHistory"
+        android:summary="Graphical history. (Circle WF)"
+        android:title="@string/pref_ring_history"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="softRingHistory"
+        android:summary="Less eyecandy. (Circle WF)"
+        android:title="@string/pref_light_ring_history"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="animation"
+        android:summary="Animations. (Circle WF)"
+        android:title="@string/pref_animations"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
    
 
     <CheckBoxPreference

wear/src/main/res/xml/watch_face_configuration_home.xml

@@ -2,8 +2,21 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="@string/pref_dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="match_divider"
+        android:summary="Status bar divider background matches watchface background"
+        android:title="@string/pref_matching_divider"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
     <CheckBoxPreference
         android:key="vibrate_Hourly"

wear/src/main/res/xml/watch_face_configuration_home2.xml

@@ -2,8 +2,28 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="@string/pref_dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="match_divider"
+        android:summary="Status bar divider background matches watchface background"
+        android:title="@string/pref_matching_divider"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="show_date"
+        android:title="@string/pref_show_date"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:key="vibrate_Hourly"

wear/src/main/res/xml/watch_face_configuration_largehome.xml

@@ -2,8 +2,21 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="@string/pref_dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
-
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="match_divider"
+        android:summary="Status bar divider background matches watchface background"
+        android:title="@string/pref_matching_divider"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
     <CheckBoxPreference
         android:key="vibrate_Hourly"

wear/src/main/res/xml/watch_face_configuration_nochart.xml

@@ -2,7 +2,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="dark"
+        android:summary="Dark theme"
+        android:title="@string/pref_dark"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
 
 
     <CheckBoxPreference

wear/src/main/res/xml/watch_face_configuration_steampunk.xml

@@ -11,4 +11,13 @@
         android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
+    <ListPreference
+        android:defaultValue="2"
+        android:entries="@array/delta_granularity"
+        android:entryValues="@array/delta_granularity_values"
+        android:key="delta_granularity"
+        android:summary="Delta Granularity (Steampunk)"
+        android:title="@string/pref_delta_granularity" />
+
 </PreferenceScreen>