commit 8071d18ad509b84493b9161519d3a3ac7bfc1504
author Doris Ling <dling@google.com> Thu Apr 06 17:20:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 17:20:52 2017 +0000
tree a9e37a5565e7c2379a476828e27cdf5211001a55
parent 766643750aa1536efb4cf0240547db4df540514c
parent 0950fa569b7c39680a484e3f01271bef2b96cc5e

Merge "Update Wifi off summary text." into oc-dev am: 28e35fcf05
am: 0950fa569b

Change-Id: I439f95faddf7848e14d7f94a37e65f5b93394645

src/com/android/settings/wifi/WifiSummaryUpdater.java

diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java
index c0d4468..2c56d08 100644
--- a/src/com/android/settings/wifi/WifiSummaryUpdater.java
+++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java
@@ -75,7 +75,7 @@
     @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);

tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java

diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
index df290b3..967da08 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -103,7 +103,7 @@
         mWifiTracker.enabled = false;
 
         assertThat(mSummaryUpdater.getSummary()).isEqualTo(
-            mContext.getString(R.string.wifi_disabled_generic));
+            mContext.getString(R.string.switch_off_text));
     }
 
     @Test