Merge "Have WebView Implementation Dev Setting use DefaultAppPickerFragment." (9ae1b8b0) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -1980,8 +1980,9 @@
		<activity android:name=".AppPicker" android:label="@string/select_application"
		android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />

		<activity android:name=".webview.WebViewAppPicker" android:label="@string/select_webview_provider_dialog_title"
		android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
		<activity android:name="Settings$WebViewAppPickerActivity"
		android:label="@string/select_webview_provider_dialog_title">
		</activity>

		<!-- Keep compatibility with old shortcuts. -->
		<activity-alias android:name="UsbSettings"
		@@ -2945,7 +2946,7 @@

		<!-- Keep compatibility with old WebView-picker implementation -->
		<activity-alias android:name=".WebViewImplementation"
		android:targetActivity=".webview.WebViewAppPicker"
		android:targetActivity="Settings$WebViewAppPickerActivity"
		android:exported="true"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
		@@ -2955,6 +2956,8 @@
		</intent-filter>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.webview.WebViewAppPicker" />
		</activity-alias>

		<!-- activity for gesture settings -->

res/values/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -8180,9 +8180,9 @@
		<string name="audio_storage_title">Music</string>

		<!-- UI webview setting: WebView uninstalled-for-user explanatory text [CHAR LIMIT=30] -->
		<string name="webview_uninstalled_for_user">Uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>\n</string>
		<string name="webview_uninstalled_for_user">(uninstalled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
		<!-- UI webview setting: WebView disabled-for-user explanatory text [CHAR LIMIT=30] -->
		<string name="webview_disabled_for_user">Disabled for user <xliff:g id="user" example="John Doe">%s</xliff:g>\n</string>
		<string name="webview_disabled_for_user">(disabled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>

		<!-- AutoFill strings -->
		<!-- Preference label for the auto-fill app. [CHAR LIMIT=60] -->

res/xml/development_prefs.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,8 @@

		<Preference android:key="select_webview_provider"
		android:title="@string/select_webview_provider_title"
		android:dialogTitle="@string/select_webview_provider_dialog_title" />
		android:dialogTitle="@string/select_webview_provider_dialog_title"
		android:fragment="com.android.settings.webview.WebViewAppPicker" />

		<SwitchPreference
		android:key="enable_webview_multiprocess"

src/com/android/settings/DevelopmentSettings.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -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) {

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ public class Settings extends SettingsActivity {
		public static class WifiAPITestActivity extends SettingsActivity { /* empty */ }
		public static class WifiInfoActivity extends SettingsActivity { /* empty */ }
		public static class EnterprisePrivacySettingsActivity extends SettingsActivity { /* empty */ }
		public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }

		// Categories.
		public static class WirelessSettings extends SettingsActivity { /* empty */ }