PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Reduce Bright Colors preference string" into sc-dev am: 286247a9b6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960429

Change-Id: Ia963ff0d90637deac7bd0c2ca5b18794f0d1251d
This commit is contained in:
Sally Yuen
2021-03-24 19:51:47 +00:00
committed by Automerger Merge Worker
parent 861a58ab89 286247a9b6
commit cbe24179ad
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.accessibility;
import android.content.Context; import android.content.Context;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
/** PreferenceController that shows the Reduce Bright Colors summary */ /** PreferenceController that shows the Reduce Bright Colors summary */
@@ -32,8 +32,8 @@ public class ReduceBrightColorsPreferenceController extends BasePreferenceContro
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return AccessibilityUtil.getSummary(mContext, return mContext.getText(
Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED); R.string.reduce_bright_colors_preference_summary);
} }
@Override @Override

2
src/com/android/settings/accessibility/TurnScreenDarkerFragment.java
View File

@@ -94,8 +94,6 @@ public class TurnScreenDarkerFragment extends DashboardFragment {
if (ColorDisplayManager.isColorTransformAccelerated(getContext())) { if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary( mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED)); getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary(
getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED));
getPreferenceScreen().removePreference(experimentalCategory); getPreferenceScreen().removePreference(experimentalCategory);
} else { } else {
// Move following preferences to experimental category if device don't supports HWC // Move following preferences to experimental category if device don't supports HWC

20
tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -32,29 +31,14 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class ReduceBrightColorsPreferenceControllerTest { public class ReduceBrightColorsPreferenceControllerTest {
private static final String PREF_KEY = "rbc_preference"; 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 Context mContext = ApplicationProvider.getApplicationContext();
private final ReduceBrightColorsPreferenceController mController = private final ReduceBrightColorsPreferenceController mController =
new ReduceBrightColorsPreferenceController(mContext, PREF_KEY); new ReduceBrightColorsPreferenceController(mContext, PREF_KEY);
@Test @Test
public void getSummary_enabledRbc_shouldReturnOnSummary() { public void getSummary_returnSummary() {
Settings.Secure.putInt(mContext.getContentResolver(),
RBC_ACTIVATED, ON);
assertThat(mController.getSummary().toString().contains( assertThat(mController.getSummary().toString().contains(
mContext.getText(R.string.accessibility_feature_state_on))).isTrue(); mContext.getText(R.string.reduce_bright_colors_preference_summary))).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();
} }
} }