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

Merge "Update Wifi off summary text." into oc-dev

Browse Source
This commit is contained in:
Doris Ling
2017-04-06 17:04:44 +00:00
committed by Android (Google) Code Review
parent 5a03e321bc 5853f9742f
commit 28e35fcf05
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiSummaryUpdater.java
View File

@@ -75,7 +75,7 @@ public final class WifiSummaryUpdater extends SummaryUpdater {
@Override
public String getSummary() {
if (!mWifiTracker.enabled) {
return mContext.getString(R.string.wifi_disabled_generic);
return mContext.getString(R.string.switch_off_text);
}
if (!mWifiTracker.connected) {
return mContext.getString(R.string.disconnected);

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

@@ -103,7 +103,7 @@ public class WifiSummaryUpdaterTest {
mWifiTracker.enabled = false;
assertThat(mSummaryUpdater.getSummary()).isEqualTo(
mContext.getString(R.string.wifi_disabled_generic));
mContext.getString(R.string.switch_off_text));
}
@Test