commit 7e1b47347a9f44d1b6748ea28ac8fe3912a4d27a
author Jason Monk <jmonk@google.com> Wed Jun 01 17:39:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 17:39:13 2016 +0000
tree d26fd6f5f5af019da25f4961485ff2caff26f08d
parent 6548f7f3f5e973ac50f0626d9cf1cd2a1e5c3537
parent ed703565063107350970959d82ac63eb76b51d26

Merge "Fix some top-level settings not updating with language" into nyc-dev
am: ed70356506

* commit 'ed703565063107350970959d82ac63eb76b51d26':
  Fix some top-level settings not updating with language

Change-Id: I4f2f0295a73e115fdcc8eb76cc40854cc98e493c

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4531367..6d990b7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -198,7 +198,7 @@
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.wireless" />
             <meta-data android:name="com.android.settings.title"
-                android:value="@string/radio_controls_title" />
+                android:resource="@string/radio_controls_title" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.WirelessSettings" />
             <!-- Note that this doesn't really show any Wireless settings. -->
@@ -976,7 +976,7 @@
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.system" />
             <meta-data android:name="com.android.settings.title"
-                android:value="@string/about_settings" />
+                android:resource="@string/about_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DeviceInfoSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1792,7 +1792,7 @@
             <meta-data android:name="com.android.settings.category"
                 android:value="com.android.settings.category.device" />
             <meta-data android:name="com.android.settings.title"
-                android:value="@string/storage_usb_settings" />
+                android:resource="@string/storage_usb_settings" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.deviceinfo.StorageSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"