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
src/com/android/settings/development/ForceMSAAPreferenceController.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.development;
import android.content.Context;
import android.os.SystemProperties;
import android.sysprop.DisplayProperties;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -32,9 +32,6 @@ public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceCon
private static final String FORCE_MSAA_KEY = "force_msaa";
@VisibleForTesting
static final String MSAA_PROPERTY = "debug.egl.force_msaa";
public ForceMSAAPreferenceController(Context context) {
super(context);
}
@@ -47,22 +44,21 @@ public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceCon
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
SystemProperties.set(MSAA_PROPERTY,
isEnabled ? Boolean.toString(true) : Boolean.toString(false));
DisplayProperties.debug_force_msaa(isEnabled);
SystemPropPoker.getInstance().poke();
return true;
}
@Override
public void updateState(Preference preference) {
final boolean isEnabled = SystemProperties.getBoolean(MSAA_PROPERTY, false /* default */);
final boolean isEnabled = DisplayProperties.debug_force_msaa().orElse(false);
((SwitchPreference) mPreference).setChecked(isEnabled);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
SystemProperties.set(MSAA_PROPERTY, Boolean.toString(false));
DisplayProperties.debug_force_msaa(false);
((SwitchPreference) mPreference).setChecked(false);
}
}

6
src/com/android/settings/development/RtlLayoutPreferenceController.java
View File

@@ -17,8 +17,8 @@
package com.android.settings.development;
import android.content.Context;
import android.os.SystemProperties;
import android.provider.Settings;
import android.sysprop.DisplayProperties;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -79,8 +79,6 @@ public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceCon
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DEVELOPMENT_FORCE_RTL,
isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL,
isEnabled ? Integer.toString(SETTING_VALUE_ON)
: Integer.toString(SETTING_VALUE_OFF));
DisplayProperties.debug_force_rtl(isEnabled);
}
}

10
src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.development;
import android.content.Context;
import android.os.SystemProperties;
import android.sysprop.DisplayProperties;
import android.view.View;
import androidx.preference.Preference;
@@ -44,23 +44,21 @@ public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPrefer
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
isEnabled ? Boolean.toString(true) : Boolean.toString(false));
DisplayProperties.debug_layout(isEnabled);
SystemPropPoker.getInstance().poke();
return true;
}
@Override
public void updateState(Preference preference) {
final boolean isEnabled = SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY,
false /* default */);
final boolean isEnabled = DisplayProperties.debug_layout().orElse(false);
((SwitchPreference) mPreference).setChecked(isEnabled);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
DisplayProperties.debug_layout(false);
((SwitchPreference) mPreference).setChecked(false);
}
}

7
src/com/android/settings/development/qstile/DevelopmentTiles.java
View File

@@ -27,6 +27,7 @@ import android.os.SystemProperties;
import android.provider.Settings;
import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
import android.sysprop.DisplayProperties;
import android.util.Log;
import android.view.IWindowManager;
import android.view.ThreadedRenderer;
@@ -98,12 +99,12 @@ public abstract class DevelopmentTiles extends TileService {
@Override
protected boolean isEnabled() {
return SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false);
return DisplayProperties.debug_layout().orElse(false);
}
@Override
protected void setIsEnabled(boolean isEnabled) {
SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, isEnabled ? "true" : "false");
DisplayProperties.debug_layout(isEnabled);
}
}
@@ -139,7 +140,7 @@ public abstract class DevelopmentTiles extends TileService {
protected void setIsEnabled(boolean isEnabled) {
Settings.Global.putInt(
getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? 1 : 0);
SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, isEnabled ? "1" : "0");
DisplayProperties.debug_force_rtl(isEnabled);
LocalePicker.updateLocales(getResources().getConfiguration().getLocales());
}
}