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

Merge "Schematize Display system properties"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-16 17:28:57 +00:00
committed by Android (Google) Code Review
parent a96d56c83a 1a3425ed2a
commit c327e550f4
6 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
View File

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
import android.sysprop.DisplayProperties;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -60,8 +60,7 @@ public class ForceMSAAPreferenceControllerTest {
public void onPreferenceChanged_settingEnabled_turnOnForceMsaa() {
mController.onPreferenceChange(mPreference, true /* new value */);
final boolean mode = SystemProperties
.getBoolean(ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
final boolean mode = DisplayProperties.debug_force_msaa().orElse(false);
assertThat(mode).isTrue();
}
@@ -70,15 +69,14 @@ public class ForceMSAAPreferenceControllerTest {
public void onPreferenceChanged_settingDisabled_turnOffForceMsaa() {
mController.onPreferenceChange(mPreference, false /* new value */);
final boolean mode = SystemProperties
.getBoolean(ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
final boolean mode = DisplayProperties.debug_force_msaa().orElse(false);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
SystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY, Boolean.toString(true));
DisplayProperties.debug_force_msaa(true);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -86,7 +84,7 @@ public class ForceMSAAPreferenceControllerTest {
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
SystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY, Boolean.toString(false));
DisplayProperties.debug_force_msaa(false);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);

15
tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
View File

@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.SystemProperties;
import android.sysprop.DisplayProperties;
import android.view.View;
import androidx.preference.PreferenceScreen;
@@ -58,8 +58,7 @@ public class ShowLayoutBoundsPreferenceControllerTest {
public void onPreferenceChanged_settingEnabled_turnOnShowLayoutBounds() {
mController.onPreferenceChange(mPreference, true /* new value */);
final boolean mode =
SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
final boolean mode = DisplayProperties.debug_layout().orElse(false);
assertThat(mode).isTrue();
}
@@ -68,15 +67,14 @@ public class ShowLayoutBoundsPreferenceControllerTest {
public void onPreferenceChanged_settingDisabled_turnOffShowLayoutBounds() {
mController.onPreferenceChange(mPreference, false /* new value */);
final boolean mode =
SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
final boolean mode = DisplayProperties.debug_layout().orElse(false);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(true));
DisplayProperties.debug_layout(true);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -84,7 +82,7 @@ public class ShowLayoutBoundsPreferenceControllerTest {
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
DisplayProperties.debug_layout(false);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -94,8 +92,7 @@ public class ShowLayoutBoundsPreferenceControllerTest {
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
final boolean mode =
SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
final boolean mode = DisplayProperties.debug_layout().orElse(false);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);