From 1eb976734f8404bc5da40b4f6ec7769160a91e72 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 25 May 2012 14:40:43 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I5fc26962b300a9aa2a83ef5c492bb477b3ec57e2
---
 overlay/packages/apps/Settings/res/values-cs/arrays.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'overlay')

diff --git a/overlay/packages/apps/Settings/res/values-cs/arrays.xml b/overlay/packages/apps/Settings/res/values-cs/arrays.xml
index 266d10e..265da14 100644
--- a/overlay/packages/apps/Settings/res/values-cs/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-cs/arrays.xml
@@ -21,11 +21,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 s."</item>
-    <item msgid="8672738773876256432">"30 s."</item>
-    <item msgid="465923292941002466">"1 min."</item>
-    <item msgid="7955177189296850016">"2 min."</item>
-    <item msgid="1244255986255344525">"5 min."</item>
-    <item msgid="294890536998091748">"10 min."</item>
+    <item msgid="5314770629356662739">"15 sekund"</item>
+    <item msgid="8672738773876256432">"30 sekund"</item>
+    <item msgid="465923292941002466">"1 minuta"</item>
+    <item msgid="7955177189296850016">"2 minuty"</item>
+    <item msgid="1244255986255344525">"5 minut"</item>
+    <item msgid="294890536998091748">"10 minut"</item>
   </string-array>
 </resources>
-- 
cgit v1.1


From 76c7a5bf734dd63a1bd7e9a856242040423d5438 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 18 Jun 2012 14:34:57 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I36532a2b851b39fa1eeed891df9e2198657d2e8f
---
 overlay/packages/apps/Settings/res/values-nb/arrays.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'overlay')

diff --git a/overlay/packages/apps/Settings/res/values-nb/arrays.xml b/overlay/packages/apps/Settings/res/values-nb/arrays.xml
index c5db781..a365905 100644
--- a/overlay/packages/apps/Settings/res/values-nb/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-nb/arrays.xml
@@ -23,9 +23,9 @@
   <string-array name="screen_timeout_entries">
     <item msgid="5314770629356662739">"15 sekunder"</item>
     <item msgid="8672738773876256432">"30 sekunder"</item>
-    <item msgid="465923292941002466">"Ett minutt"</item>
-    <item msgid="7955177189296850016">"To minutter"</item>
-    <item msgid="1244255986255344525">"Fem minutter"</item>
-    <item msgid="294890536998091748">"Ti minutter"</item>
+    <item msgid="465923292941002466">"1 minutt"</item>
+    <item msgid="7955177189296850016">"2 minutter"</item>
+    <item msgid="1244255986255344525">"5 minutter"</item>
+    <item msgid="294890536998091748">"10 minutter"</item>
   </string-array>
 </resources>
-- 
cgit v1.1


From b48bb6dd51fe4adfe1ad72cf5f69ee7c5feee07d Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 13 Jul 2012 13:01:48 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I5c5fe495ec486d1de6e7e1e483ce64bf81458d28
Auto-generated-cl: translation import
---
 overlay/packages/apps/Settings/res/values-fa/arrays.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'overlay')

diff --git a/overlay/packages/apps/Settings/res/values-fa/arrays.xml b/overlay/packages/apps/Settings/res/values-fa/arrays.xml
index bf95ca8..71915a9 100644
--- a/overlay/packages/apps/Settings/res/values-fa/arrays.xml
+++ b/overlay/packages/apps/Settings/res/values-fa/arrays.xml
@@ -21,11 +21,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="screen_timeout_entries">
-    <item msgid="5314770629356662739">"15 ثانیه"</item>
-    <item msgid="8672738773876256432">"30 ثانیه"</item>
-    <item msgid="465923292941002466">"1 دقیقه"</item>
-    <item msgid="7955177189296850016">"2 دقیقه"</item>
-    <item msgid="1244255986255344525">"5 دقیقه"</item>
-    <item msgid="294890536998091748">"10 دقیقه"</item>
+    <item msgid="5314770629356662739">"۱۵ ثانیه"</item>
+    <item msgid="8672738773876256432">"۳۰ ثانیه"</item>
+    <item msgid="465923292941002466">"۱ دقیقه"</item>
+    <item msgid="7955177189296850016">"۲ دقیقه"</item>
+    <item msgid="1244255986255344525">"۵ دقیقه"</item>
+    <item msgid="294890536998091748">"۱۰ دقیقه"</item>
   </string-array>
 </resources>
-- 
cgit v1.1


From 1681a277aeaa794a35eff17e3ef648eadcdc4b11 Mon Sep 17 00:00:00 2001
From: zzy <zhenye@broadcom.com>
Date: Sat, 14 Apr 2012 19:09:37 -0700
Subject: added bt-pan network interface for tethering

---
 overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f85627b..a8e196a 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -213,7 +213,7 @@
          bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
          should be empty. -->
     <string-array translatable="false" name="config_tether_bluetooth_regexs">
-        <item>"bnep\\d"</item>
+        <item>"bt-pan"</item>
     </string-array>
 
     <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
-- 
cgit v1.1


From 60468b085c78e4902709231d89f1d958bcb59e87 Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Wed, 1 Aug 2012 15:59:09 -0700
Subject: Update config.xml overlay for new key
 config_overlay_locationProviderPackageNames

Change-Id: Iee90badf46f797a2fdf76e8fbfef61b8edc0c340
---
 overlay/frameworks/base/core/res/res/values/config.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index a8e196a..2a08cac 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -234,11 +234,9 @@
 
     <bool name="config_ui_enableFadingMarquee">false</bool>
 
-    <!-- Package name providing network location support. -->
-    <string name="config_networkLocationProviderPackageName" translatable="false">com.google.android.location</string>
-
-    <!-- Package name providing geocoder API support. -->
-    <string name="config_geocodeProviderPackageName" translatable="false">com.google.android.location</string>
+    <string-array name="config_overlay_locationProviderPackageNames" translatable="false">
+        <item>com.google.android.location</item>
+    </string-array>
 
     <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveNotificationLed">true</bool>
-- 
cgit v1.1


From e8378f43b0d6d25b6a306cd0ac0c4cdcb12aa7a8 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 11 Sep 2012 15:13:26 -0700
Subject: No multiuser settings for phones

Change-Id: I22300346f05d066db65e43cdd699f5dbc910b515
---
 overlay/packages/apps/Settings/res/values/bools.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'overlay')

diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
index 711eb51..b5e8b7b 100644
--- a/overlay/packages/apps/Settings/res/values/bools.xml
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -17,6 +17,4 @@
 <resources>
     <!-- Show dock settings when docked -->
     <bool name="has_dock_settings">true</bool>
-    <!-- Enable user management -->
-    <bool name="enable_user_management">true</bool>
 </resources>
-- 
cgit v1.1


From 260f6e0aac21567ddf16390e9b0206f923d5081f Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 11 Sep 2012 23:18:48 -0700
Subject: Include user identifier in external storage paths.

When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Bug: 7131382
Change-Id: Ic065fb8739a9d5d6e7f88ab93932391d906fed57
---
 .../base/core/res/res/xml/storage_list.xml         | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 0a03928..344fe1e 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -17,25 +17,12 @@
 */
 -->
 
-<!-- The <device> element should contain one or more <storage> elements.
-     Exactly one of these should have the attribute primary="true".
-     This storage will be the primary external storage and should have path="/mnt/sdcard".
-     Each storage should have both a path and description attribute set.
-     The following boolean attributes are optional:
-
-        primary:    this storage is the primary external storage
-        removable:  this is removable storage (for example, a real SD card)
-        emulated:   the storage is emulated via the FUSE sdcard daemon
-        mtp-reserve: number of megabytes of storage MTP should reserve for free storage
-                     (used for emulated storage that is shared with system's data partition)
-
-      A storage should not have both emulated and removable set to true
--->
+<!-- See storage config details at http://source.android.com/tech/storage/ -->
 
 <StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <storage android:mountPoint="/storage/sdcard0"
-             android:storageDescription="@string/storage_internal"
-             android:primary="true"
-             android:emulated="true"
-             android:mtpReserve="100" />
+    <!-- internal emulated storage -->
+    <storage
+        android:storageDescription="@string/storage_internal"
+        android:emulated="true"
+        android:mtpReserve="100" />
 </StorageList>
-- 
cgit v1.1


From f2e62f6c54e7361c47f407527be81e5ae9f27d07 Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@android.com>
Date: Wed, 3 Oct 2012 15:32:29 -0500
Subject: Remove the Google specific location config.

Bug: 7242814
Change-Id: I2ca49b1173fcb3119301d90e0ffc5b2c81b59977
---
 overlay/frameworks/base/core/res/res/values/config.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2a08cac..2cd1c67 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -234,10 +234,6 @@
 
     <bool name="config_ui_enableFadingMarquee">false</bool>
 
-    <string-array name="config_overlay_locationProviderPackageNames" translatable="false">
-        <item>com.google.android.location</item>
-    </string-array>
-
     <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveNotificationLed">true</bool>
 
-- 
cgit v1.1


From 01d531673584bf2e7eb50f0e3979915e6b6911bc Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@android.com>
Date: Fri, 5 Oct 2012 13:01:43 -0500
Subject: Revert "Remove the Google specific location config."

This reverts commit f2e62f6c54e7361c47f407527be81e5ae9f27d07.

Change-Id: I575b57b5e8399190320795863ae2549dac3c1682
---
 overlay/frameworks/base/core/res/res/values/config.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2cd1c67..2a08cac 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -234,6 +234,10 @@
 
     <bool name="config_ui_enableFadingMarquee">false</bool>
 
+    <string-array name="config_overlay_locationProviderPackageNames" translatable="false">
+        <item>com.google.android.location</item>
+    </string-array>
+
     <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveNotificationLed">true</bool>
 
-- 
cgit v1.1


From 57418d64328a9da5d9bde3011653643de2d08c92 Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@android.com>
Date: Tue, 16 Oct 2012 08:44:35 -0500
Subject: Remove the Google specific location config.

This reverts commit 01d531673584bf2e7eb50f0e3979915e6b6911bc.

Bug: 7242814
Change-Id: I8cf6180b42a71d15b461776250acd67a68e36b90
---
 overlay/frameworks/base/core/res/res/values/config.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2a08cac..2cd1c67 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -234,10 +234,6 @@
 
     <bool name="config_ui_enableFadingMarquee">false</bool>
 
-    <string-array name="config_overlay_locationProviderPackageNames" translatable="false">
-        <item>com.google.android.location</item>
-    </string-array>
-
     <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveNotificationLed">true</bool>
 
-- 
cgit v1.1