From 665a1d65a3f51accaa6c51ce21f5e7446dde0082 Mon Sep 17 00:00:00 2001
From: Daz Jones <yuki@thebronasium.com>
Date: Fri, 11 Oct 2013 21:29:49 +0100
Subject: [PATCH] Fix the vold switchable pair settings patch (again)

---
 .../0001-vold-switchable-pair.patch           | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/patches/packages_apps_Settings/0001-vold-switchable-pair.patch b/patches/packages_apps_Settings/0001-vold-switchable-pair.patch
index cbcca5f..c115348 100644
--- a/patches/packages_apps_Settings/0001-vold-switchable-pair.patch
+++ b/patches/packages_apps_Settings/0001-vold-switchable-pair.patch
@@ -1,4 +1,4 @@
-From 052075313b8ecf2283b39b3ea4a67278c61798c6 Mon Sep 17 00:00:00 2001
+From a6cce39f12164c811b76b9c4f54e6b1188e0dbd0 Mon Sep 17 00:00:00 2001
 From: dhacker29 <davidhackerdvm@gmail.com>
 Date: Sat, 17 Aug 2013 16:35:18 -0500
 Subject: [PATCH] Add setting for Vold Switchable Pair (2/2)
@@ -11,13 +11,13 @@ to be set in the build.prop.
 Change-Id: Id83fc90d771ca3a7179f2c50d0ae828eb3dbaa9f
 ---
  AndroidManifest.xml                             |  1 +
- res/values/cm_strings.xml                       |  8 ++++
+ res/values/cm_strings.xml                       |  7 ++++
  res/xml/device_info_memory.xml                  |  5 +++
  src/com/android/settings/deviceinfo/Memory.java | 54 ++++++++++++++++++++++++-
- 4 files changed, 67 insertions(+), 1 deletion(-)
+ 4 files changed, 66 insertions(+), 1 deletion(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index cb65bbb..7a697c4 100644
+index 20f5209..9026f39 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
 @@ -66,6 +66,7 @@
@@ -29,13 +29,13 @@ index cb65bbb..7a697c4 100644
      <permission
          android:name="android.permission.REQUEST_SUPERUSER"
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
-index bc60e30..418eced 100644
+index d0d9fcc..e980a89 100644
 --- a/res/values/cm_strings.xml
 +++ b/res/values/cm_strings.xml
-@@ -1009,4 +1009,12 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
-     <!-- SELinux warning -->
-     <string name="selinux_enable_title">Security Enhanced Android</string>
-     <string name="selinux_enable_warning">You are about to enable SEAndroid, an advanced security mechanism, on your device.\n\nThis option exists for debugging purposes only, and it is very likely that your device isn\'t fully ready for it, which may cause parts (or all) of your hardware to block or hang.\n\nAre you sure you want to proceed?</string>
+@@ -1014,4 +1014,11 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
+ 
+     <!-- GPS download data over wi-fi only -->
+     <string name="gps_download_data_wifi_only">Download GPS assisted data only over Wi-Fi networks</string>
 +
 +    <!-- Vold Switchable Pair -->
 +    <string name="storage_switch_title">Use external SD as primary</string>
@@ -43,7 +43,6 @@ index bc60e30..418eced 100644
 +    <string name="storage_switch_summary_on">Using SD Card for apps and media</string>
 +    <string name="reboot_prompt_title">Reboot required</string>
 +    <string name="reboot_prompt_message">In order to apply the changed configuration, a reboot is required.\n\nDo you want to reboot now?</string>
-+
  </resources>
 diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
 index e905f39..2010b2c 100644