From: Doris Ling <dling@google.com>
Date: Mon, 3 Apr 2017 18:38:10 +0000 (-0700)
Subject: Update Wifi off summary text.
X-Git-Tag: android-x86-8.1-r1~113^2~11^2~187^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5853f9742fb72ef155338b94f6904e635e87f675;p=android-x86%2Fpackages-apps-Settings.git

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 c0d4468826..2c56d08d23 100644
--- 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 df290b30c5..967da089fa 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 @@ 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