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

Commit 286247a9 authored by Sally Yuen's avatar Sally Yuen Committed by Android (Google) Code Review
Browse files

Merge "Update Reduce Bright Colors preference string" into sc-dev

parents a8df0386 cd09b3a5

src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java

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

src/com/android/settings/accessibility/TurnScreenDarkerFragment.java

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

tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java

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



        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);



    public void getSummary_returnSummary() {

        assertThat(mController.getSummary().toString().contains(

                mContext.getText(R.string.accessibility_feature_state_off))).isTrue();

                mContext.getText(R.string.reduce_bright_colors_preference_summary))).isTrue();

    }

}