From cd09b3a571ae7cb256ce559c6f0b2bd3db282240 Mon Sep 17 00:00:00 2001 From: sallyyuen Date: Mon, 22 Mar 2021 19:52:38 -0700 Subject: [PATCH] Update Reduce Bright Colors preference string Test: manual, atest ReduceBrightColorsPreferenceControllerTest Bug: 182116724 Change-Id: Ifde343aad7c6931efd083a1c728a2504b74f089f --- ...educeBrightColorsPreferenceController.java | 6 +++--- .../TurnScreenDarkerFragment.java | 2 -- ...eBrightColorsPreferenceControllerTest.java | 20 ++----------------- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java index 82b3a642cbe..bfe61b7b4ab 100644 --- a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java +++ b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.accessibility; import android.content.Context; import android.hardware.display.ColorDisplayManager; -import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.BasePreferenceController; /** PreferenceController that shows the Reduce Bright Colors summary */ @@ -32,8 +32,8 @@ public class ReduceBrightColorsPreferenceController extends BasePreferenceContro @Override public CharSequence getSummary() { - return AccessibilityUtil.getSummary(mContext, - Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED); + return mContext.getText( + R.string.reduce_bright_colors_preference_summary); } @Override diff --git a/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java b/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java index ad4bd56ccca..0e0a6007a85 100644 --- a/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java +++ b/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java @@ -94,8 +94,6 @@ public class TurnScreenDarkerFragment extends DashboardFragment { if (ColorDisplayManager.isColorTransformAccelerated(getContext())) { mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary( getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED)); - mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary( - getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED)); getPreferenceScreen().removePreference(experimentalCategory); } else { // Move following preferences to experimental category if device don't supports HWC diff --git a/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java index 39a663ed654..01942f0590a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.provider.Settings; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -32,29 +31,14 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class ReduceBrightColorsPreferenceControllerTest { private static final String PREF_KEY = "rbc_preference"; - private static final String RBC_ACTIVATED = - Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED; - private static final int ON = 1; - private static final int OFF = 0; private final Context mContext = ApplicationProvider.getApplicationContext(); private final ReduceBrightColorsPreferenceController mController = new ReduceBrightColorsPreferenceController(mContext, PREF_KEY); @Test - public void getSummary_enabledRbc_shouldReturnOnSummary() { - Settings.Secure.putInt(mContext.getContentResolver(), - RBC_ACTIVATED, ON); - + public void getSummary_returnSummary() { assertThat(mController.getSummary().toString().contains( - mContext.getText(R.string.accessibility_feature_state_on))).isTrue(); - } - @Test - public void getSummary_disabledRbc_shouldReturnOffSummary() { - Settings.Secure.putInt(mContext.getContentResolver(), - RBC_ACTIVATED, OFF); - - assertThat(mController.getSummary().toString().contains( - mContext.getText(R.string.accessibility_feature_state_off))).isTrue(); + mContext.getText(R.string.reduce_bright_colors_preference_summary))).isTrue(); } }