[2/2] OmniGears: volume dialog headers and force media volume

Change-Id: I4f01e0bfd7cfdc6ed20e5fc06968e2280c7ef370
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index bb84d65..9070ec7 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -26,12 +26,19 @@
             android:title="@string/swap_volume_buttons_title"
             android:summary="@string/swap_volume_buttons_summary"
             android:defaultValue="false" />
+
+        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            android:key="volume_button_force_media"
+            android:title="@string/volume_button_force_media_title"
+            android:summary="@string/volume_button_force_media_summary"
+            android:defaultValue="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="button_power"
         android:title="@string/global_actions_power_title" >
-        
+
         <Preference
             android:key="global_actions"
             android:title="@string/global_actions_title"
diff --git a/res/xml/more_settings.xml b/res/xml/more_settings.xml
index b830e57..46ca535 100644
--- a/res/xml/more_settings.xml
+++ b/res/xml/more_settings.xml
@@ -20,6 +20,18 @@
     android:title="@string/more_settings_title">
 
         <PreferenceCategory
+            android:key="category_other"
+            android:title="@string/other_category">
+
+            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+                android:key="volume_dialog_headers"
+                android:title="@string/volume_dialog_headers_title"
+                android:summary="@string/volume_dialog_headers_summary"
+                android:defaultValue="true" />
+
+        </PreferenceCategory>
+
+        <PreferenceCategory
             android:key="category_system"
             android:title="@string/system_category">