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

Merge "Update metered string" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-20 20:05:07 +00:00
committed by Android (Google) Code Review
parent 012e04fa02 aea566d44e
commit f9dade022c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/arrays.xml
View File

@@ -1070,7 +1070,7 @@
</string-array> </string-array>
<string-array name="wifi_metered_entries"> <string-array name="wifi_metered_entries">
<item>Use network preference</item> <item>Detect automatically</item>
<item>Treat as metered</item> <item>Treat as metered</item>
<item>Treat as unmetered</item> <item>Treat as unmetered</item>
</string-array> </string-array>

2
tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
View File

@@ -81,6 +81,6 @@ public class WifiMeteredPreferenceControllerTest {
mPreferenceController.updateState(mDropDownPreference); mPreferenceController.updateState(mDropDownPreference);
assertThat(mDropDownPreference.getEntry()).isEqualTo("Use network preference"); assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically");
} }
} }