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

Commit 457f75a1 authored by Salvador Martinez's avatar Salvador Martinez Committed by android-build-merger
Browse files

Merge "Update metered string" into pi-dev am: f9dade02 

am: b07afe05

Change-Id: I23f628dd65088a01a980f2ba278945e1bf92e903
parents 97128f86 b07afe05

res/values/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ 
    </string-array>



    <string-array name="wifi_metered_entries">

        <item>Use network preference</item>

        <item>Detect automatically</item>

        <item>Treat as metered</item>

        <item>Treat as unmetered</item>

    </string-array>

tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ public class WifiMeteredPreferenceControllerTest { 


        mPreferenceController.updateState(mDropDownPreference);



        assertThat(mDropDownPreference.getEntry()).isEqualTo("Use network preference");

        assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically");

    }

}