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

Merge "Have WebView Implementation Dev Setting use DefaultAppPickerFragment."

Browse Source
This commit is contained in:
Gustav Sennton
2017-02-09 17:36:32 +00:00
committed by Android (Google) Code Review
parent fd1e070118 5b596285a0
commit 9ae1b8b046
15 changed files with 365 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/DevelopmentSettings.java
View File

@@ -233,7 +233,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final int RESULT_DEBUG_APP = 1000;
private static final int RESULT_MOCK_LOCATION_APP = 1001;
private static final int RESULT_WEBVIEW_APP = 1002;
private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
private static final String FLASH_LOCKED_PROP = "ro.boot.flash.locked";
@@ -801,7 +800,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateSimulateColorSpace();
updateUSBAudioOptions();
updateForceResizableOptions();
mWebViewAppPrefController.updateState(null);
Preference webViewAppPref = findPreference(mWebViewAppPrefController.getPreferenceKey());
mWebViewAppPrefController.updateState(webViewAppPref);
updateWebViewMultiprocessOptions();
updateOemUnlockOptions();
if (mColorTemperaturePreference != null) {
@@ -2330,8 +2330,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeMockLocation();
updateMockLocation();
}
} else if (requestCode == RESULT_WEBVIEW_APP) {
mWebViewAppPrefController.onActivityResult(resultCode, data);
} else if (requestCode == REQUEST_CODE_ENABLE_OEM_UNLOCK) {
if (resultCode == Activity.RESULT_OK) {
if (mEnableOemUnlock.isChecked()) {
@@ -2355,8 +2353,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
return true;
}
if (mWebViewAppPrefController.handlePreferenceTreeClick(preference)) {
startActivityForResult(
mWebViewAppPrefController.getActivityIntent(), RESULT_WEBVIEW_APP);
return true;
}
if (preference == mEnableAdb) {