Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0950fa56 authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Merge "Update Wifi off summary text." into oc-dev 

am: 28e35fcf

Change-Id: I11dbcaa0c5f4509624b174e7daf1aca5506befc2
parents 5221d1cd 28e35fcf

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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