From aea566d44edb2f09bb0038a9afae7e18c66211d4 Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Tue, 20 Mar 2018 10:27:21 -0700 Subject: [PATCH] Update metered string This CL updates the metered network string to say 'detect automatically' instead of 'network preference' Bug: 68030417 Test: rototest, visual inspection Change-Id: I347e3b89b014d7ec0d5d0e6601f2813a3a96f5ab --- res/values/arrays.xml | 2 +- .../wifi/details/WifiMeteredPreferenceControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index e326dbe3caf..5c3dc8f2763 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1070,7 +1070,7 @@ - Use network preference + Detect automatically Treat as metered Treat as unmetered diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java index d568004cc08..b3e5cb5117e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -81,6 +81,6 @@ public class WifiMeteredPreferenceControllerTest { mPreferenceController.updateState(mDropDownPreference); - assertThat(mDropDownPreference.getEntry()).isEqualTo("Use network preference"); + assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically"); } }