From 5853f9742fb72ef155338b94f6904e635e87f675 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Mon, 3 Apr 2017 11:38:10 -0700 Subject: [PATCH] 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 --- src/com/android/settings/wifi/WifiSummaryUpdater.java | 2 +- .../robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.11.0