commit 0950fa569b7c39680a484e3f01271bef2b96cc5e
author Doris Ling <dling@google.com> Thu Apr 06 17:08:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 17:08:04 2017 +0000
tree 4e88760b2a7278682471e686271e63faf7712fa9
parent 5221d1cd0afb9cb1392beca07863beb9aaa4219b
parent 28e35fcf05de14acda1ceb12c010d93462eac5aa

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

Change-Id: I11dbcaa0c5f4509624b174e7daf1aca5506befc2

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