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

am: 7dc8293963

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

Change-Id: Ib65a09bf6d46eedd7cb6dd28fe70ecadb6ce1e46
This commit is contained in:
Jason Monk
2016-06-01 18:06:15 +00:00
committed by android-build-merger

View File

@@ -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"
@@ -1794,7 +1794,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"