From 3fb7346656c63a27c23b181fffe42c8da56cbe3a Mon Sep 17 00:00:00 2001
From: davidevinavil <davidevinavil@gmail.com>
Date: Mon, 1 May 2017 22:34:29 +0200
Subject: overlay: aex-ify

---
 .../apps/DU-Tweaks/res/xml/button_settings.xml     | 146 ----------------
 .../apps/Extensions/res/values-cs/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-de/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-es/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-in/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-it/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-pt-rBR/strings.xml  |  28 ++++
 .../apps/Extensions/res/values-ru/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-sk/strings.xml      |  28 ++++
 .../apps/Extensions/res/values-zh-rCN/strings.xml  |  28 ++++
 .../apps/Extensions/res/values/strings.xml         |  28 ++++
 .../packages/apps/Extensions/res/xml/buttons.xml   | 185 +++++++++++++++++++++
 .../apps/Settings/res/values-cs/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-de/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-el/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-es/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-fr/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-hu/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-it/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-ja/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-nl/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-pl/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-pt-rBR/du_strings.xml |  25 ---
 .../apps/Settings/res/values-pt-rPT/du_strings.xml |  25 ---
 .../apps/Settings/res/values-ru/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-sk/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-tr/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-uk/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-vi/du_strings.xml     |  25 ---
 .../apps/Settings/res/values-zh-rCN/du_strings.xml |  25 ---
 .../apps/Settings/res/values-zh-rHK/du_strings.xml |  25 ---
 .../apps/Settings/res/values-zh-rTW/du_strings.xml |  25 ---
 .../packages/apps/Settings/res/values/config.xml   |  27 ---
 .../packages/apps/Settings/res/values/dimens.xml   |  17 --
 .../apps/Settings/res/values/du_strings.xml        |  25 ---
 .../apps/Settings/res/xml/privacy_settings.xml     |  53 ------
 .../SnapdragonCamera/res/values/qcomstrings.xml    |  28 ++++
 37 files changed, 493 insertions(+), 768 deletions(-)
 delete mode 100644 overlay/packages/apps/DU-Tweaks/res/xml/button_settings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-cs/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-de/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-es/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-in/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-it/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-pt-rBR/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-ru/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-sk/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values-zh-rCN/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/values/strings.xml
 create mode 100644 overlay/packages/apps/Extensions/res/xml/buttons.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-cs/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-de/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-el/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-es/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-fr/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-hu/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-it/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-ja/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-nl/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-pl/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-pt-rBR/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-pt-rPT/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-ru/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-sk/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-tr/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-uk/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-vi/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-zh-rCN/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-zh-rHK/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values-zh-rTW/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values/config.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values/dimens.xml
 delete mode 100644 overlay/packages/apps/Settings/res/values/du_strings.xml
 delete mode 100644 overlay/packages/apps/Settings/res/xml/privacy_settings.xml
 create mode 100644 overlay/packages/apps/SnapdragonCamera/res/values/qcomstrings.xml

(limited to 'overlay/packages')

diff --git a/overlay/packages/apps/DU-Tweaks/res/xml/button_settings.xml b/overlay/packages/apps/DU-Tweaks/res/xml/button_settings.xml
deleted file mode 100644
index 6b26d4c..0000000
--- a/overlay/packages/apps/DU-Tweaks/res/xml/button_settings.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  Copyright (C) 2016 The Dirty Unicorns Project
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  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">
-
-    <com.dirtyunicorns.dutweaks.preference.SecureSettingSwitchPreference
-        android:key="sysui_show_full_zen"
-        android:title="@string/tuner_full_zen_title"
-        android:summary="@string/tuner_full_zen_summary"
-        android:defaultValue="false"/>
-
-    <com.dirtyunicorns.dutweaks.preference.SystemSettingSwitchPreference
-        android:key="volume_keys_control_media_stream"
-        android:title="@string/volume_keys_control_media_stream_title"
-        android:summary="@string/volume_keys_control_media_stream_summary"
-        android:defaultValue="false" />
-
-    <SwitchPreference
-        android:key="swap_volume_buttons"
-        android:title="@string/swap_volume_buttons_title"
-        android:summary="@string/swap_volume_buttons_summary" />
-
-    <SwitchPreference
-        android:key="volume_rocker_wake"
-        android:summary="@string/volume_rocker_wake_summary"
-        android:title="@string/volume_rocker_wake_title"
-        android:defaultValue="false"
-        android:disableDependentsState="true" />
-
-    <SwitchPreference
-        android:key="volume_rocker_music_controls"
-        android:summary="@string/volume_rocker_music_controls_summary"
-        android:title="@string/volume_rocker_music_controls_title"
-        android:defaultValue="true"
-        android:dependency="volume_rocker_wake" />
-
-    <PreferenceCategory
-        android:key="hardware_keys"
-        android:title="@string/hardware_keys_category" >
-
-        <SwitchPreference
-            android:key="hardware_keys_disable"
-            android:title="@string/hardware_keys_disable_title" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="back_key"
-        android:title="@string/hardware_keys_back_key_title" >
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_back_single_tap"
-            android:summary="@string/hardware_keys_single_tap_summary"
-            android:title="@string/hardware_keys_single_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_assist_single_tap"
-            android:summary="@string/hardware_keys_long_press_summary"
-            android:title="@string/hardware_keys_long_press_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_back_double_tap"
-            android:summary="@string/hardware_keys_double_tap_summary"
-            android:title="@string/hardware_keys_double_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="home_key"
-        android:title="@string/hardware_keys_home_key_title" >
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_home_single_tap"
-            android:summary="@string/hardware_keys_single_tap_summary"
-            android:title="@string/hardware_keys_single_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_home_long_press"
-            android:summary="@string/hardware_keys_long_press_summary"
-            android:title="@string/hardware_keys_long_press_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_home_double_tap"
-            android:summary="@string/hardware_keys_double_tap_summary"
-            android:title="@string/hardware_keys_double_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="app_switch_key"
-        android:title="@string/hardware_keys_appswitch_key_title" >        
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_overview_single_tap"
-            android:summary="@string/hardware_keys_single_tap_summary"
-            android:title="@string/hardware_keys_single_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_overview_double_tap"
-            android:summary="@string/hardware_keys_double_tap_summary"
-            android:title="@string/hardware_keys_double_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="menu_key"
-        android:title="@string/hardware_keys_menu_key_title" >
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_menu_single_tap"
-            android:summary="@string/hardware_keys_single_tap_summary"
-            android:title="@string/hardware_keys_single_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-        <com.dirtyunicorns.dutweaks.preference.ActionPreference
-            android:key="hwkeys_button_menu_double_tap"
-            android:summary="@string/hardware_keys_double_tap_summary"
-            android:title="@string/hardware_keys_double_tap_title" >
-        </com.dirtyunicorns.dutweaks.preference.ActionPreference>
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/overlay/packages/apps/Extensions/res/values-cs/strings.xml b/overlay/packages/apps/Extensions/res/values-cs/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-cs/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-de/strings.xml b/overlay/packages/apps/Extensions/res/values-de/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-de/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-es/strings.xml b/overlay/packages/apps/Extensions/res/values-es/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-es/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-in/strings.xml b/overlay/packages/apps/Extensions/res/values-in/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-in/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-it/strings.xml b/overlay/packages/apps/Extensions/res/values-it/strings.xml
new file mode 100644
index 0000000..31f4add
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-it/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Tasto Home</string>
+    <string name="hardware_keys_menu_key_title">Swipe a destra</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Swipe a sinistra</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-pt-rBR/strings.xml b/overlay/packages/apps/Extensions/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-pt-rBR/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-ru/strings.xml b/overlay/packages/apps/Extensions/res/values-ru/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-ru/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-sk/strings.xml b/overlay/packages/apps/Extensions/res/values-sk/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-sk/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values-zh-rCN/strings.xml b/overlay/packages/apps/Extensions/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values-zh-rCN/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/values/strings.xml b/overlay/packages/apps/Extensions/res/values/strings.xml
new file mode 100644
index 0000000..e48bb69
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/values/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2014-2016 The Dirty Unicorns Project
+      Copyright (C) 2016 AospExtended ROM Project
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <!-- Hardware button navigation -->
+    <string name="hardware_keys_home_key_title">Home button</string>
+    <string name="hardware_keys_menu_key_title">Right swipe</string>
+    <string name="hardware_keys_assist_key_title">Long tap</string>
+    <string name="hardware_keys_appswitch_key_title">Left swipe</string>
+    <string name="hardware_keys_back_key_title">Tap</string>
+ 
+</resources>
diff --git a/overlay/packages/apps/Extensions/res/xml/buttons.xml b/overlay/packages/apps/Extensions/res/xml/buttons.xml
new file mode 100644
index 0000000..ee62620
--- /dev/null
+++ b/overlay/packages/apps/Extensions/res/xml/buttons.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 AospExtended ROM 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"
+    android:title="@string/buttons_title">
+
+   <PreferenceCategory
+        android:key="power_menu"
+        android:title="@string/power_menu_title">
+
+   <PreferenceScreen
+	     android:key="power_menu"
+             android:title="@string/power_menu_title"
+             android:summary="@string/power_menu_title_summary"
+	     android:fragment="org.aospextended.extensions.PowerMenuSettings" />
+    </PreferenceCategory>
+
+   <PreferenceCategory
+        android:key="volume_category"
+        android:title="@string/volume_category">
+
+    <org.aospextended.extensions.preference.SecureSettingSwitchPreference
+        android:key="sysui_show_full_zen"
+        android:title="@string/tuner_full_zen_title"
+        android:summary="@string/tuner_full_zen_summary"
+        android:defaultValue="false"/>
+
+    <org.aospextended.extensions.preference.SystemSettingSwitchPreference
+        android:key="volume_keys_control_media_stream"
+        android:title="@string/volume_keys_control_media_stream_title"
+        android:summary="@string/volume_keys_control_media_stream_summary"
+        android:defaultValue="false" />
+
+    <org.aospextended.extensions.preference.SystemSettingSwitchPreference
+        android:key="swap_volume_keys_on_rotation"
+        android:title="@string/swap_volume_buttons_title"
+        android:summary="@string/swap_volume_buttons_summary" />
+
+    <org.aospextended.extensions.preference.SystemSettingSwitchPreference
+        android:key="volume_rocker_wake"
+        android:summary="@string/volume_rocker_wake_summary"
+        android:title="@string/volume_rocker_wake_title"
+        android:defaultValue="false"
+        android:disableDependentsState="true" />
+
+    <org.aospextended.extensions.preference.SystemSettingSwitchPreference
+        android:key="volume_rocker_music_controls"
+        android:summary="@string/volume_rocker_music_controls_summary"
+        android:title="@string/volume_rocker_music_controls_title"
+        android:defaultValue="true"
+        android:dependency="volume_rocker_wake" />
+
+    <ListPreference
+        android:key="volume_key_cursor_control"
+        android:dialogTitle="@string/volbtn_cursor_control_title"
+        android:title="@string/volbtn_cursor_control_title"
+        android:entries="@array/volbtn_cursor_control_entries"
+        android:entryValues="@array/volbtn_cursor_control_values"
+        android:persistent="false" />
+ 
+    </PreferenceCategory>
+
+     <PreferenceCategory
+        android:key="hardware_keys"
+        android:title="@string/hardware_keys_category" >
+
+     <SwitchPreference
+         android:key="hardware_keys_disable"
+        android:title="@string/hardware_keys_disable_title" />
+
+    <org.aospextended.extensions.preference.CustomSeekBarPreference
+        android:key="button_brightness"
+        android:title="@string/button_brightness_title"
+        android:max="255"
+        settings:min="0"
+        settings:units=""
+        android:persistent="false" />
+
+    <ListPreference
+        android:dialogTitle="@string/backlight_timeout_title"
+        android:entries="@array/backlight_timeout_entries"
+        android:entryValues="@array/backlight_timeout_values"
+        android:key="backlight_timeout"
+        android:persistent="false"
+        android:title="@string/backlight_timeout_title" />
+
+    </PreferenceCategory>
+
+<PreferenceCategory
+        android:key="back_key"
+        android:title="@string/hardware_keys_back_key_title" >
+
+         <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_back_single_tap"
+            android:summary="@string/hardware_keys_single_tap_summary"
+            android:title="@string/hardware_keys_single_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_assist_single_tap"
+            android:summary="@string/hardware_keys_long_press_summary"
+            android:title="@string/hardware_keys_long_press_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_back_double_tap"
+            android:summary="@string/hardware_keys_double_tap_summary"
+            android:title="@string/hardware_keys_double_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="home_key"
+        android:title="@string/hardware_keys_home_key_title" >
+
+         <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_home_single_tap"
+            android:summary="@string/hardware_keys_single_tap_summary"
+            android:title="@string/hardware_keys_single_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_home_long_press"
+            android:summary="@string/hardware_keys_long_press_summary"
+            android:title="@string/hardware_keys_long_press_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_home_double_tap"
+            android:summary="@string/hardware_keys_double_tap_summary"
+            android:title="@string/hardware_keys_double_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="app_switch_key"
+        android:title="@string/hardware_keys_appswitch_key_title" >        
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_overview_single_tap"
+            android:summary="@string/hardware_keys_single_tap_summary"
+            android:title="@string/hardware_keys_single_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_overview_double_tap"
+            android:summary="@string/hardware_keys_double_tap_summary"
+            android:title="@string/hardware_keys_double_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="menu_key"
+        android:title="@string/hardware_keys_menu_key_title" >        
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_menu_single_tap"
+            android:summary="@string/hardware_keys_single_tap_summary"
+            android:title="@string/hardware_keys_single_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+        <org.aospextended.extensions.preference.ActionPreference
+            android:key="hwkeys_button_menu_double_tap"
+            android:summary="@string/hardware_keys_double_tap_summary"
+            android:title="@string/hardware_keys_double_tap_title" >
+        </org.aospextended.extensions.preference.ActionPreference>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/overlay/packages/apps/Settings/res/values-cs/du_strings.xml b/overlay/packages/apps/Settings/res/values-cs/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-cs/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-de/du_strings.xml b/overlay/packages/apps/Settings/res/values-de/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-de/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-el/du_strings.xml b/overlay/packages/apps/Settings/res/values-el/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-el/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-es/du_strings.xml b/overlay/packages/apps/Settings/res/values-es/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-es/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-fr/du_strings.xml b/overlay/packages/apps/Settings/res/values-fr/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-fr/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-hu/du_strings.xml b/overlay/packages/apps/Settings/res/values-hu/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-hu/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-it/du_strings.xml b/overlay/packages/apps/Settings/res/values-it/du_strings.xml
deleted file mode 100644
index bb7fad6..0000000
--- a/overlay/packages/apps/Settings/res/values-it/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Tasto Home</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe a destra</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe a sinistra</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-ja/du_strings.xml b/overlay/packages/apps/Settings/res/values-ja/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-ja/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-nl/du_strings.xml b/overlay/packages/apps/Settings/res/values-nl/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-nl/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-pl/du_strings.xml b/overlay/packages/apps/Settings/res/values-pl/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-pl/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-pt-rBR/du_strings.xml b/overlay/packages/apps/Settings/res/values-pt-rBR/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-pt-rBR/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-pt-rPT/du_strings.xml b/overlay/packages/apps/Settings/res/values-pt-rPT/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-pt-rPT/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-ru/du_strings.xml b/overlay/packages/apps/Settings/res/values-ru/du_strings.xml
deleted file mode 100644
index 81e0e3b..0000000
--- a/overlay/packages/apps/Settings/res/values-ru/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title">Кнопка Домой</string>
-    <string name="hardware_keys_menu_key_title">Свайп вправо</string>
-    <string name="hardware_keys_assist_key_title">Долгое касание</string>
-    <string name="hardware_keys_appswitch_key_title">Свайп влево</string>
-    <string name="hardware_keys_back_key_title">Касание</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values-sk/du_strings.xml b/overlay/packages/apps/Settings/res/values-sk/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-sk/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-tr/du_strings.xml b/overlay/packages/apps/Settings/res/values-tr/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-tr/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-uk/du_strings.xml b/overlay/packages/apps/Settings/res/values-uk/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-uk/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-vi/du_strings.xml b/overlay/packages/apps/Settings/res/values-vi/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-vi/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-zh-rCN/du_strings.xml b/overlay/packages/apps/Settings/res/values-zh-rCN/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-zh-rCN/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-zh-rHK/du_strings.xml b/overlay/packages/apps/Settings/res/values-zh-rHK/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-zh-rHK/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values-zh-rTW/du_strings.xml b/overlay/packages/apps/Settings/res/values-zh-rTW/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values-zh-rTW/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 88ade9f..0000000
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<resources>
-  <bool name="config_show_volumeRockerWake">true</bool>
-
-  <!-- Defines the location of the fingerprint sensor on the device
-       0 = back
-       1 = front
-       2 = left side
-       3 = right side
-  -->
-  <integer name="config_fingerprintSensorLocation">1</integer>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/dimens.xml b/overlay/packages/apps/Settings/res/values/dimens.xml
deleted file mode 100644
index e44b96c..0000000
--- a/overlay/packages/apps/Settings/res/values/dimens.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source 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.
--->
-
-<resources>
-    <dimen name="fingerprint_dot_radius">5dp</dimen>
-    <item name="fingerprint_sensor_location_fraction_y" type="fraction">73.91%</item>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/du_strings.xml b/overlay/packages/apps/Settings/res/values/du_strings.xml
deleted file mode 100644
index 290692e..0000000
--- a/overlay/packages/apps/Settings/res/values/du_strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The ResurrectionRemix 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Hardware button navigation -->
-    <string name="hardware_keys_home_key_title" translatable="false">Home button</string>
-    <string name="hardware_keys_menu_key_title" translatable="false">Swipe right</string>
-    <string name="hardware_keys_assist_key_title" translatable="false">Long tap</string>
-    <string name="hardware_keys_appswitch_key_title" translatable="false">Swipe left</string>
-    <string name="hardware_keys_back_key_title" translatable="false">Tap</string>
-	
-	    <!-- NFC -->
-    <string name="nfc_options_category"> </string>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/packages/apps/Settings/res/xml/privacy_settings.xml b/overlay/packages/apps/Settings/res/xml/privacy_settings.xml
deleted file mode 100644
index 558b43a..0000000
--- a/overlay/packages/apps/Settings/res/xml/privacy_settings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009-2011 The Android Open Source 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"
-    android:title="@string/privacy_settings_title">
-
-    <!-- Backup settings -->
-    <PreferenceScreen
-        android:key="backup_data"
-        android:title="@string/backup_data_title"
-        android:persistent="false"
-        android:fragment="com.android.settings.backup.ToggleBackupSettingFragment"/>
-
-    <PreferenceScreen
-        android:key="configure_account"
-        android:title="@string/backup_configure_account_title"
-        android:persistent="false">
-        <!-- the Intent declared here is always overwritten by a real one -->
-        <intent android:action="dummy" />
-    </PreferenceScreen>
-
-    <PreferenceScreen
-        android:key="data_management"
-        android:persistent="false">
-    </PreferenceScreen>
-
-    <SwitchPreference
-        android:key="auto_restore"
-        android:title="@string/auto_restore_title"
-        android:summary="@string/auto_restore_summary" />
-
-    <Preference
-        android:key="backup_inactive"
-        android:title="@string/backup_inactive_title"
-        android:persistent="false"
-        android:enabled="false"
-        android:selectable="false" />
-
-</PreferenceScreen>
diff --git a/overlay/packages/apps/SnapdragonCamera/res/values/qcomstrings.xml b/overlay/packages/apps/SnapdragonCamera/res/values/qcomstrings.xml
new file mode 100644
index 0000000..4047838
--- /dev/null
+++ b/overlay/packages/apps/SnapdragonCamera/res/values/qcomstrings.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
+
+    Not a Contribution.
+
+    Copyright (C) 2007 The Android Open Source Project
+    Copyright (C) 2017 The LineageOS 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.
+-->
+
+<resources>
+
+    <!-- Settings screen, setting title text for ZSL-->
+    <string name="pref_camera_zsl_default" translatable="false">off</string>
+
+</resources>
+
-- 
cgit v1.2.3