Merge "Update title for metered preference" into qt-dev am: 6e55084e19

am: 18952e522d

Change-Id: Ie2d85c66e781aa6a07532cc8cc3aab2e39540daf
This commit is contained in:
Lei Yu
2019-05-03 19:20:35 -07:00
committed by android-build-merger
2 changed files with 3 additions and 1 deletions

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] -->

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"/>