Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update title for metered preference" into qt-dev

Browse Source 
am: 6e55084e19

Change-Id: Ic2f9a47d86ed505746870213dbe8ef21772fccda
This commit is contained in:
Lei Yu
2019-05-02 20:17:20 -07:00
committed by android-build-merger
parent c7c90f352b 6e55084e19
commit 1ed874b0bf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6385,6 +6385,8 @@
<!-- Option for indicating that a network being metered (expensive) should be determined automatically. [CHAR LIMIT=32] -->
<string name="data_usage_metered_auto">Automatic</string>
<!-- Title for Network usage to control whether Wifi is metered or not [CHAR LIMIT=20] -->
<string name="wifi_metered_title">Network usage</string>
<!-- Option for indicating that a network is metered (expensive). [CHAR LIMIT=32] -->
<string name="data_usage_metered_yes">Metered</string>
<!-- Option for indicating that a network is not metered (inexpensive). [CHAR LIMIT=32] -->

2
res/xml/wifi_network_details_fragment.xml
View File

@@ -58,7 +58,7 @@
<DropDownPreference
android:key="metered"
android:icon="@drawable/ic_attach_money_black_24dp"
android:title="@string/data_usage_metered_yes"
android:title="@string/wifi_metered_title"
android:entries="@array/wifi_metered_entries"
android:entryValues="@array/wifi_metered_values"/>