PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4f63855b5a

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

Change-Id: I37449c716a0944f91818ee68fae663fce8d4dabe
This commit is contained in:
Jason Monk
2016-06-01 17:42:36 +00:00
committed by android-build-merger
parent 69f0f29e38 4f63855b5a
commit 7dc8293963
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -198,7 +198,7 @@
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.wireless" /> android:value="com.android.settings.category.wireless" />
<meta-data android:name="com.android.settings.title" <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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WirelessSettings" /> android:value="com.android.settings.WirelessSettings" />
<!-- Note that this doesn't really show any Wireless settings. --> <!-- Note that this doesn't really show any Wireless settings. -->
@@ -976,7 +976,7 @@
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.system" /> android:value="com.android.settings.category.system" />
<meta-data android:name="com.android.settings.title" <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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DeviceInfoSettings" /> android:value="com.android.settings.DeviceInfoSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1794,7 +1794,7 @@
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.device" /> android:value="com.android.settings.category.device" />
<meta-data android:name="com.android.settings.title" <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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.StorageSettings" /> android:value="com.android.settings.deviceinfo.StorageSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"