From 57f18af55481fc3f95fa61aa6a0411c5efd38f35 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 17 Apr 2019 13:29:25 -0700 Subject: [PATCH] Remove on/off subtext from gesture preferencecontrollers The toggle switch next to the subtitle already shows on/off clearly. Fixes: 130652619 Fixes: 130652843 Fixes: 130653459 Fixes: 130653297 Test: robo Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5 --- res/values/strings.xml | 3 ++ res/xml/battery_saver_settings.xml | 1 + .../DoubleTapPowerPreferenceController.java | 2 -- .../gestures/GesturePreferenceController.java | 7 ----- .../settings/slices/SliceBuilderUtils.java | 29 ++++++------------- .../GesturePreferenceControllerTest.java | 15 ---------- 6 files changed, 13 insertions(+), 44 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 3365b5dd1d1..915f17e97c0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5693,6 +5693,9 @@ Set a schedule + + Extend battery life + Turn off when fully charged diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml index c8d1d6302c1..528e648443f 100644 --- a/res/xml/battery_saver_settings.xml +++ b/res/xml/battery_saver_settings.xml @@ -37,6 +37,7 @@ android:key="battery_saver" android:title="@string/battery_saver" android:selectable="false" + android:summary="@string/battery_saver_turn_on_summary" settings:textOn="@string/battery_saver_button_turn_on" settings:textOff="@string/battery_saver_button_turn_off" settings:platform_slice="true" diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index f697d11b798..751bb798aba 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -33,13 +33,11 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl static final int OFF = 1; private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video"; - private final String mDoubleTapPowerKey; private final String SECURE_KEY = CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED; public DoubleTapPowerPreferenceController(Context context, String key) { super(context, key); - mDoubleTapPowerKey = key; } public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) { diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index d7b386ada81..97de95dcba6 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -23,7 +23,6 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.widget.VideoPreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -64,12 +63,6 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro } } - @Override - public CharSequence getSummary() { - return mContext.getText( - isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off); - } - @Override public void onCreate(Bundle savedInstanceState) { if (savedInstanceState != null) { diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index aa76a9e75bb..cf45d57381d 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -189,39 +189,28 @@ public class SliceBuilderUtils { */ public static CharSequence getSubtitleText(Context context, BasePreferenceController controller, SliceData sliceData) { - final boolean isDynamicSummaryAllowed = controller.useDynamicSliceSummary(); - CharSequence summaryText = controller.getSummary(); // Priority 1 : User prefers showing the dynamic summary in slice view rather than static // summary. Note it doesn't require a valid summary - so we can force some slices to have // empty summaries (ex: volume). - if (isDynamicSummaryAllowed) { + if (controller.useDynamicSliceSummary()) { + return controller.getSummary(); + } + + // Priority 2: Show summary from slice data. + CharSequence summaryText = sliceData.getSummary(); + if (isValidSummary(context, summaryText)) { return summaryText; } - // Priority 2 : Show screen title. + // Priority 3: Show screen title. summaryText = sliceData.getScreenTitle(); if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText, sliceData.getTitle())) { return summaryText; } - // Priority 3 : Show dynamic summary from preference controller. - if (controller != null) { - summaryText = controller.getSummary(); - - if (isValidSummary(context, summaryText)) { - return summaryText; - } - } - - // Priority 4 : Show summary from slice data. - summaryText = sliceData.getSummary(); - if (isValidSummary(context, summaryText)) { - return summaryText; - } - - // Priority 5 : Show empty text. + // Priority 4: Show empty text. return ""; } diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 32be603db65..d96ce751cbb 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -176,21 +176,6 @@ public class GesturePreferenceControllerTest { verify(preference).setChecked(false); } - @Test - public void updateState_notTwoStatePreference_setSummary() { - // Mock a regular preference - final Preference preference = mock(Preference.class); - // Set the setting to be disabled. - mController.mIsPrefEnabled = false; - - // Run through updateState - mController.updateState(preference); - - // Verify summary is set to off (as setting is disabled). - assertThat(preference.getSummary()).isEqualTo( - mContext.getString(com.android.settings.R.string.gesture_setting_off)); - } - private class TestPrefController extends GesturePreferenceController { boolean mIsPrefAvailable;