Merge "Location toggle enhancements [2/2]" into kitkat

4 files changed, 55 insertions, 0 deletions

diff --git a/res/layout/fragment_toggle_setup.xml b/res/layout/fragment_toggle_setup.xml
index 1e9e8d1..8bc218d 100644
--- a/res/layout/fragment_toggle_setup.xml
+++ b/res/layout/fragment_toggle_setup.xml
@@ -136,5 +136,17 @@
             android:defaultValue="1"
             />
 
+    <com.aokp.romcontrol.settings.SingleChoiceSetting
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/location_modes_toggle"
+
+            android:key="location_modes_toggle"
+            android:title="@string/location_modes_toggle_title"
+            android:entries="@array/location_modes_toggle_entries"
+            android:entryValues="@array/location_modes_toggle_values"
+            android:defaultValue="1"
+            />
+
     </LinearLayout>
 </ScrollView>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 29b0703..c6ef4b2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -239,6 +239,16 @@
   <string name="network_modes_toggle_lte2g">LTE/2G</string>
   <string name="hide_ribbon_timeout_lte3g">LTE/3G</string>
   <string name="hide_ribbon_timeout_3g2g">3G/2G</string>
+  <string name="location_modes_toggle_title">Režimy polohy k přepínání</string>
+  <string name="location_modes_toggle_all">Všechny</string>
+  <string name="location_modes_toggle_hbs">Vysoká přesnost/Úspora baterie/Pouze zařízení</string>
+  <string name="location_modes_toggle_hb">Vysoká přesnost/Úspora baterie</string>
+  <string name="location_modes_toggle_hs">Vysoká přesnost/Pouze zařízení</string>
+  <string name="location_modes_toggle_ho">Vysoká přesnost/Vypnuto</string>
+  <string name="location_modes_toggle_bso">Úspora baterie/Pouze zařízení/Vypnuto</string>
+  <string name="location_modes_toggle_bs">Úspora baterie/Pouze zařízení</string>
+  <string name="location_modes_toggle_bo">Úspora baterie/Vypnuto</string>
+  <string name="location_modes_toggle_so">Pouze zařízení/Vypnuto</string>
   <string name="enable_navigation_bar_title">Zapnout navigační lištu</string>
   <string name="enable_navigation_bar_summary">Zapnout navigační lištu na obrazovce</string>
   <string name="navbar_ring_cat">Položky navigačního kruhu</string>
diff --git a/res/values/arrays_settings.xml b/res/values/arrays_settings.xml
index db3dc1b..9d85d37 100644
--- a/res/values/arrays_settings.xml
+++ b/res/values/arrays_settings.xml
@@ -265,6 +265,29 @@
         <item>4</item>
     </string-array>
 
+    <string-array name="location_modes_toggle_entries" translatable="false">
+        <item>@string/location_modes_toggle_all</item>
+        <item>@string/location_modes_toggle_hbs</item>
+        <item>@string/location_modes_toggle_hb</item>
+        <item>@string/location_modes_toggle_hs</item>
+        <item>@string/location_modes_toggle_ho</item>
+        <item>@string/location_modes_toggle_bso</item>
+        <item>@string/location_modes_toggle_bs</item>
+        <item>@string/location_modes_toggle_bo</item>
+        <item>@string/location_modes_toggle_so</item>
+    </string-array>
+    <string-array name="location_modes_toggle_values" translatable="false">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+    </string-array>
+
     <string-array name="power_menuEntries" translatable="false">
         <item>@string/hide_option</item>
         <item>@string/on_always</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0355c5..b3a04b9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -324,6 +324,16 @@
     <string name="network_modes_toggle_lte2g">LTE/2G</string>
     <string name="hide_ribbon_timeout_lte3g">LTE/3G</string>
     <string name="hide_ribbon_timeout_3g2g">3G/2G</string>
+    <string name="location_modes_toggle_title">Location modes for toggle</string>
+    <string name="location_modes_toggle_all">All</string>
+    <string name="location_modes_toggle_hbs">High accuracy/Battery saving/Device only</string>
+    <string name="location_modes_toggle_hb">High accuracy/Battery saving</string>
+    <string name="location_modes_toggle_hs">High accuracy/Device only</string>
+    <string name="location_modes_toggle_ho">High accuracy/Off</string>
+    <string name="location_modes_toggle_bso">Battery saving/Device only/Off</string>
+    <string name="location_modes_toggle_bs">Battery saving/Device only</string>
+    <string name="location_modes_toggle_bo">Battery saving/Off</string>
+    <string name="location_modes_toggle_so">Device only/Off</string>
 
     <!-- Navigation Bar -->
     <string name="enable_navigation_bar_title">Enable navigation bar</string>