Update Wifi off summary text.

Changed the test from "disabled" to off when wifi is turned off.

Fix: 36296257
Test: make RunSettingsRoboTests
Change-Id: Iae421c15b812fa7a5c3ec841e9d2c28d21063884

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

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 (file)
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -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