[2/2] OmniGears: allow to swap volume buttons rotation based

Change-Id: I57fe5347207175b8124b38295744253cf3305e4c
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 5272260..26e53d2 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -14,27 +14,24 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<!-- Copyright (C) 2012 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <PreferenceCategory
+        android:key="button_volume_keys"
+        android:title="@string/button_volume_keys_title" >
+
+        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            android:key="swap_volume_buttons"
+            android:title="@string/swap_volume_buttons_title"
+            android:summary="@string/swap_volume_buttons_summary"
+            android:defaultValue="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
         android:key="button_other"
         android:title="@string/button_other_title" >
+
         <ListPreference
             android:key="navbar_recents_style"
             android:title="@string/navbar_recents_style_title"
@@ -47,7 +44,7 @@
             android:entries="@array/long_press_recents_action_entries"
             android:entryValues="@array/long_press_recents_action_values"
             android:persistent="false"/>
-        <PreferenceScreen
+        <Preference
             android:key="global_actions"
             android:title="@string/global_actions_title"
             android:summary="@string/global_actions_summary"
diff --git a/res/xml/style_settings.xml b/res/xml/style_settings.xml
index e87dc57..09a8a1b 100644
--- a/res/xml/style_settings.xml
+++ b/res/xml/style_settings.xml
@@ -17,30 +17,29 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-        <PreferenceCategory
-            android:key="category_theming"
-            android:title="@string/theming_title">
+    <PreferenceCategory
+        android:key="category_theming"
+        android:title="@string/theming_title">
 
-            <Preference
-                android:key="custom_wall_browse"
-                android:title="@string/custom_wall_browse_title"
-                android:summary="@string/custom_wall_browse_summary"
-                android:persistent="false" >
-                <intent android:action="android.intent.action.MAIN"
-                        android:targetPackage="org.omnirom.omnistyle"
-                        android:targetClass="org.omnirom.omnistyle.BrowseWallsActivity" />
-            </Preference>
-        </PreferenceCategory>
+        <Preference
+            android:key="custom_wall_browse"
+            android:title="@string/custom_wall_browse_title"
+            android:summary="@string/custom_wall_browse_summary"
+            android:persistent="false" >
+            <intent android:action="android.intent.action.MAIN"
+                    android:targetPackage="org.omnirom.omnistyle"
+                    android:targetClass="org.omnirom.omnistyle.BrowseWallsActivity" />
+        </Preference>
+    </PreferenceCategory>
 
-        <PreferenceCategory
-            android:key="category_statusbar"
-            android:title="@string/statusbar_title">
+    <PreferenceCategory
+        android:key="category_statusbar"
+        android:title="@string/statusbar_title">
 
-            <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
-                android:key="status_bar_logo"
-                android:title="@string/status_bar_logo_title"
-                android:summary="@string/status_bar_logo_summary"
-                android:defaultValue="false" />
-
-        </PreferenceCategory>
+        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            android:key="status_bar_logo"
+            android:title="@string/status_bar_logo_title"
+            android:summary="@string/status_bar_logo_summary"
+            android:defaultValue="false" />
+    </PreferenceCategory>
 </PreferenceScreen>