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

Merge "Schematize Display system properties" am: b139a4c16b

Browse Source 
am: 4d8f4919e0

Change-Id: I35412244d1fa97cb479d060e876bfddac6b523cb
This commit is contained in:
Kiyoung Kim
2019-02-11 19:25:50 -08:00
committed by android-build-merger
parent fdd54f74ed 4d8f4919e0
commit b941bc46b5
7 changed files with 27 additions and 39 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

@@ -21,7 +21,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.SwitchPreference;
import androidx.preference.PreferenceScreen;
@@ -59,8 +59,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();
}
@@ -69,15 +68,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);
@@ -85,7 +83,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

@@ -20,7 +20,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 androidx.preference.SwitchPreference;
import androidx.preference.PreferenceScreen;
import android.view.View;
@@ -57,8 +57,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();
}
@@ -67,15 +66,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);
@@ -83,7 +81,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);
@@ -93,8 +91,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);

4
tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java
View File

@@ -17,8 +17,8 @@
package com.android.settings.testutils.shadow;
import android.icu.util.ULocale;
import android.os.SystemProperties;
import android.provider.Settings;
import android.sysprop.DisplayProperties;
import android.text.TextUtils;
import android.view.View;
import java.util.Locale;
@@ -38,7 +38,7 @@ public class ShadowTextUtils {
return ((locale != null && !locale.equals(Locale.ROOT)
&& ULocale.forLocale(locale).isRightToLeft())
// If forcing into RTL layout mode, return RTL as default
|| SystemProperties.getBoolean(Settings.Global.DEVELOPMENT_FORCE_RTL, false))
|| DisplayProperties.debug_force_rtl().orElse(false))
? View.LAYOUT_DIRECTION_RTL
: View.LAYOUT_DIRECTION_LTR;
}