Merge "Full screen default app fragment" (03cd212f) · Commits · e / os / android_packages_apps_Settings

res/values/styles.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -293,10 +293,6 @@
		<!-- Scrollbar style OUTSIDE_OVERLAY -->
		<integer name="preference_scrollbar_style">33554432</integer>

		<style name="AppListSwitchPreference" parent="@*android:style/Preference.Material.DialogPreference">
		<item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
		</style>

		<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
		<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
		<style name="TextAppearance.Switch" parent="@android:style/TextAppearance.Material.Title" />

res/xml/advanced_apps.xml

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2015 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
		android:key="applications_settings">

		<Preference
		android:key="manage_perms"
		android:title="@string/app_permissions"
		settings:keywords="@string/keywords_app_permissions">
		<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
		</Preference>

		<PreferenceCategory
		android:title="@string/default_apps_title">

		<Preference
		android:key="domain_urls"
		android:title="@string/domain_urls_title"
		android:fragment="com.android.settings.applications.ManageDomainUrls" />

		<Preference
		android:key="assist_and_voice_input"
		android:fragment="com.android.settings.applications.ManageAssist"
		android:title="@string/assist_and_voice_input_title" />

		<com.android.settings.applications.DefaultHomePreference
		android:key="default_home"
		android:title="@string/home_app"
		android:summary="@string/no_default_home"
		settings:keywords="@string/keywords_home" />

		<com.android.settings.applications.DefaultBrowserPreference
		android:key="default_browser"
		android:title="@string/default_browser_title"
		android:summary="@string/default_browser_title_none" />

		<com.android.settings.applications.DefaultPhonePreference
		android:key="default_phone_app"
		android:title="@string/default_phone_title"
		settings:keywords="@string/keywords_default_phone_app" />

		<com.android.settings.applications.DefaultEmergencyPreference
		android:key="default_emergency_app"
		android:title="@string/default_emergency_app"
		settings:keywords="@string/keywords_emergency_app" />

		<com.android.settings.applications.DefaultSmsPreference
		android:key="default_sms_app"
		android:title="@string/sms_application_title"
		settings:keywords="@string/keywords_more_default_sms_app" />

		<com.android.settings.applications.DefaultNotificationAssistantPreference
		android:key="default_notification_asst_app"
		android:title="@string/default_notification_assistant" />

		</PreferenceCategory>

		<com.android.settings.WorkOnlyCategory
		android:key="work_defaults"
		android:title="@string/default_for_work">

		<com.android.settings.applications.DefaultBrowserPreference
		android:key="work_default_browser"
		android:title="@string/default_browser_title"
		android:summary="@string/default_browser_title_none"
		settings:forWork="true" />

		<com.android.settings.applications.DefaultPhonePreference
		android:key="work_default_phone_app"
		android:title="@string/default_phone_title"
		settings:keywords="@string/keywords_default_phone_app"
		settings:forWork="true" />

		</com.android.settings.WorkOnlyCategory>

		<PreferenceCategory
		android:title="@string/advanced_apps">

		<Preference
		android:key="special_access"
		android:fragment="com.android.settings.applications.SpecialAccessSettings"
		android:title="@string/special_access" />

		</PreferenceCategory>
		</PreferenceScreen>

res/xml/apn_editor.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
		android:title="@string/apn_edit">
		<EditTextPreference
		android:title="@string/apn_name"

res/xml/app_default_settings.xml

+27 −15

Original line number	Diff line number	Diff line
		@@ -26,40 +26,48 @@
		android:fragment="com.android.settings.applications.ManageAssist"
		android:order="-20"/>

		<com.android.settings.applications.DefaultBrowserPreference
		<Preference
		android:key="default_browser"
		android:title="@string/default_browser_title"
		android:summary="@string/default_browser_title_none"
		android:order="-19"/>
		android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
		android:order="-19">
		<extra android:name="for_work" android:value="false"/>
		</Preference>

		<com.android.settings.applications.DefaultHomePreference
		<Preference
		android:key="default_home"
		android:title="@string/home_app"
		android:summary="@string/no_default_home"
		settings:keywords="@string/keywords_home"
		android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
		android:order="-18"/>

		<com.android.settings.applications.DefaultPhonePreference
		<Preference
		android:key="default_phone_app"
		android:title="@string/default_phone_title"
		android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
		settings:keywords="@string/keywords_default_phone_app"
		android:order="-17"/>

		<com.android.settings.applications.DefaultSmsPreference
		<Preference
		android:key="default_sms_app"
		android:title="@string/sms_application_title"
		android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
		settings:keywords="@string/keywords_more_default_sms_app"
		android:order="-16"/>

		<com.android.settings.applications.DefaultEmergencyPreference
		<Preference
		android:key="default_emergency_app"
		android:title="@string/default_emergency_app"
		settings:keywords="@string/keywords_emergency_app"
		android:fragment="com.android.settings.applications.defaultapps.DefaultEmergencyPicker"
		android:order="-15"/>

		<com.android.settings.applications.DefaultNotificationAssistantPreference
		<Preference
		android:key="default_notification_asst_app"
		android:title="@string/default_notification_assistant"
		android:fragment="com.android.settings.applications.defaultapps.DefaultNotificationAssistantPicker"
		android:order="-14"/>

		<Preference
		@@ -71,17 +79,21 @@
		android:key="work_defaults"
		android:title="@string/default_for_work">

		<com.android.settings.applications.DefaultBrowserPreference
		<Preference
		android:key="work_default_browser"
		android:title="@string/default_browser_title"
		android:summary="@string/default_browser_title_none"
		settings:forWork="true"/>
		android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
		<extra android:name="for_work" android:value="true"/>
		</Preference>

		<com.android.settings.applications.DefaultPhonePreference
		android:key="work_default_phone_app"
		android:title="@string/default_phone_title"
		settings:keywords="@string/keywords_default_phone_app"
		settings:forWork="true"/>
		<Preference
		android:key="work_default_phone_app_new"
		android:title="new phone pref work"
		android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
		settings:keywords="@string/keywords_default_phone_app">
		<extra android:name="for_work" android:value="true"/>
		</Preference>

		</com.android.settings.WorkOnlyCategory>

res/xml/app_picker_prefs.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<PreferenceScreen>

		</PreferenceScreen>
		No newline at end of file