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 
am: 28e35fcf05

Change-Id: I11dbcaa0c5f4509624b174e7daf1aca5506befc2
This commit is contained in:
Doris Ling
2017-04-06 17:08:04 +00:00
committed by android-build-merger
parent 5221d1cd0a 28e35fcf05
commit 0950fa569b
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 @Override
public String getSummary() { public String getSummary() {
if (!mWifiTracker.enabled) { if (!mWifiTracker.enabled) {
return mContext.getString(R.string.wifi_disabled_generic); return mContext.getString(R.string.switch_off_text);
} }
if (!mWifiTracker.connected) { if (!mWifiTracker.connected) {
return mContext.getString(R.string.disconnected); 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; mWifiTracker.enabled = false;
assertThat(mSummaryUpdater.getSummary()).isEqualTo( assertThat(mSummaryUpdater.getSummary()).isEqualTo(
mContext.getString(R.string.wifi_disabled_generic)); mContext.getString(R.string.switch_off_text));
} }
@Test @Test