Merge "Repurpose the blurs dev option for window blurs" into sc-dev am: 13caa482bb am: 9573d307b5 am: 8428945580

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

Change-Id: Ia8cdcf7280413cfc8ad50316ae34ccae077d3245
This commit is contained in:
Galia Peycheva
2021-05-31 09:23:51 +00:00
committed by Automerger Merge Worker
4 changed files with 25 additions and 29 deletions

View File

@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -65,26 +65,25 @@ public final class EnableBlursPreferenceControllerTest {
public void onPreferenceChanged_settingEnabled_enableBlurs() {
mController.onPreferenceChange(mPreference, true /* new value */);
final boolean mode = SystemProperties
.getBoolean(EnableBlursPreferenceController.DISABLE_BLURS_SYSPROP,
false /* default */);
assertThat(mode).isFalse();
final boolean blursDisabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DISABLE_WINDOW_BLURS, 0) == 1;
assertThat(blursDisabled).isFalse();
}
@Test
public void onPreferenceChanged_settingDisabled_disableBlurs() {
mController.onPreferenceChange(mPreference, false /* new value */);
final boolean mode = SystemProperties
.getBoolean(EnableBlursPreferenceController.DISABLE_BLURS_SYSPROP,
false /* default */);
final boolean blursDisabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DISABLE_WINDOW_BLURS, 0) == 1;
assertThat(mode).isTrue();
assertThat(blursDisabled).isTrue();
}
@Test
public void updateState_settingEnabled_preferenceShouldNotBeChecked() {
SystemProperties.set(EnableBlursPreferenceController.DISABLE_BLURS_SYSPROP, "1");
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DISABLE_WINDOW_BLURS, 1);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -92,7 +91,8 @@ public final class EnableBlursPreferenceControllerTest {
@Test
public void updateState_settingDisabled_preferenceShouldBeChecked() {
SystemProperties.set(EnableBlursPreferenceController.DISABLE_BLURS_SYSPROP, "0");
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DISABLE_WINDOW_BLURS, 0);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);