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

Merge "Remove WebView MultiProcess Developer Option." into oc-dev am: ae72f1eeef

Browse Source 
am: b54f96015f

Change-Id: I6dc23db7a2043310860e56d7f5aa0f591f2813ce
This commit is contained in:
Gustav Sennton
2017-04-20 16:37:22 +00:00
committed by android-build-merger
parent 5cb384e625 b54f96015f
commit cad1d15586
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_prefs.xml
View File

@@ -79,11 +79,6 @@
android:dialogTitle="@string/select_webview_provider_dialog_title"
android:fragment="com.android.settings.webview.WebViewAppPicker" />
<SwitchPreference
android:key="enable_webview_multiprocess"
android:title="@string/enable_webview_multiprocess"
android:summary="@string/enable_webview_multiprocess_desc" />
<SwitchPreference
android:key="color_temperature"
android:title="@string/color_temperature"

21
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -127,7 +127,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String ENABLE_TERMINAL = "enable_terminal";
private static final String KEEP_SCREEN_ON = "keep_screen_on";
private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
private static final String WEBVIEW_MULTIPROCESS_KEY = "enable_webview_multiprocess";
private static final String ENABLE_OEM_UNLOCK = "oem_unlock_enable";
private static final String HDCP_CHECKING_KEY = "hdcp_checking";
private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
@@ -318,7 +317,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private ListPreference mOverlayDisplayDevices;
private WebViewAppPreferenceController mWebViewAppPrefController;
private SwitchPreference mWebViewMultiprocess;
private ListPreference mSimulateColorSpace;
@@ -495,7 +493,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mLogpersist = null;
}
mUsbConfiguration = addListPreference(USB_CONFIGURATION_KEY);
mWebViewMultiprocess = findAndInitSwitchPref(WEBVIEW_MULTIPROCESS_KEY);
mBluetoothDisableAbsVolume = findAndInitSwitchPref(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY);
mBluetoothEnableInbandRinging = findAndInitSwitchPref(BLUETOOTH_ENABLE_INBAND_RINGING_KEY);
if (!BluetoothHeadset.isInbandRingingSupported(getContext())) {
@@ -812,7 +809,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateForceResizableOptions();
Preference webViewAppPref = findPreference(mWebViewAppPrefController.getPreferenceKey());
mWebViewAppPrefController.updateState(webViewAppPref);
updateWebViewMultiprocessOptions();
updateOemUnlockOptions();
if (mColorTemperaturePreference != null) {
updateColorTemperature();
@@ -850,21 +846,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
pokeSystemProperties();
}
private void updateWebViewMultiprocessOptions() {
try {
updateSwitchPreference(mWebViewMultiprocess,
mWebViewUpdateService.isMultiProcessEnabled());
} catch (RemoteException e) {
}
}
private void writeWebViewMultiprocessOptions() {
try {
mWebViewUpdateService.enableMultiProcess(mWebViewMultiprocess.isChecked());
} catch (RemoteException e) {
}
}
private void updateHdcpValues() {
ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
@@ -2548,8 +2529,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeBluetoothDisableAbsVolumeOptions();
} else if (preference == mBluetoothEnableInbandRinging) {
writeBluetoothEnableInbandRingingOptions();
} else if (preference == mWebViewMultiprocess) {
writeWebViewMultiprocessOptions();
} else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
resetShortcutManagerThrottling();
} else {