Schematize Display system properties
Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: I83b40ddfcde32d8d03fae73f5c252013933c466c
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user