Back up the smooth display setting
- Convert "Smooth display" and "Force peak refresh rate" to a boolean. If they are a boolean, they can be backed up without being device-specific. - Back up "Smooth display" and add a validator - Upgrade the settings in SettingsProvider - Create a utils class - RefreshRateSettingsUtils Bug: 211737588 Test: atest DisplayModeDirectorTest Test: atest ForcePeakRefreshRatePreferenceControllerTest Test: atest PeakRefreshRatePreferenceControllerTest Test: atest SettingsBackupTest Test: atest SettingsProviderTest Change-Id: Ib2cb2dd100f06f5452083b7606109a486e795a0e Merged-In: Ib2cb2dd100f06f5452083b7606109a486e795a0e
This commit is contained in:
@@ -16,8 +16,8 @@
|
||||
|
||||
package com.android.settings.development;
|
||||
|
||||
import static com.android.settings.development.ForcePeakRefreshRatePreferenceController.DEFAULT_REFRESH_RATE;
|
||||
import static com.android.settings.development.ForcePeakRefreshRatePreferenceController.NO_CONFIG;
|
||||
import static com.android.internal.display.RefreshRateSettingsUtils.DEFAULT_REFRESH_RATE;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
@@ -38,8 +38,6 @@ import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ForcePeakRefreshRatePreferenceControllerTest {
|
||||
|
||||
@@ -63,22 +61,18 @@ public class ForcePeakRefreshRatePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_preferenceChecked_shouldEnableForcePeak() {
|
||||
mController.mPeakRefreshRate = 88f;
|
||||
|
||||
mController.onPreferenceChange(mPreference, true);
|
||||
|
||||
assertThat(Settings.System.getFloat(mContext.getContentResolver(),
|
||||
Settings.System.MIN_REFRESH_RATE, NO_CONFIG)).isEqualTo(88f);
|
||||
assertThat(Settings.System.getInt(mContext.getContentResolver(),
|
||||
Settings.System.FORCE_PEAK_REFRESH_RATE, -1)).isEqualTo(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_preferenceUnchecked_shouldDisableForcePeak() {
|
||||
mController.mPeakRefreshRate = 88f;
|
||||
|
||||
mController.onPreferenceChange(mPreference, false);
|
||||
|
||||
assertThat(Settings.System.getFloat(mContext.getContentResolver(),
|
||||
Settings.System.MIN_REFRESH_RATE, NO_CONFIG)).isEqualTo(NO_CONFIG);
|
||||
assertThat(Settings.System.getInt(mContext.getContentResolver(),
|
||||
Settings.System.FORCE_PEAK_REFRESH_RATE, -1)).isEqualTo(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -125,8 +119,8 @@ public class ForcePeakRefreshRatePreferenceControllerTest {
|
||||
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
|
||||
mController.onDeveloperOptionsSwitchDisabled();
|
||||
|
||||
assertThat(Settings.System.getFloat(mContext.getContentResolver(),
|
||||
Settings.System.MIN_REFRESH_RATE, -1f)).isEqualTo(NO_CONFIG);
|
||||
assertThat(Settings.System.getInt(mContext.getContentResolver(),
|
||||
Settings.System.FORCE_PEAK_REFRESH_RATE, -1)).isEqualTo(0);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
assertThat(mPreference.isEnabled()).isFalse();
|
||||
}
|
||||
|
Reference in New Issue
Block a user