Merge "Create a new apps page for silky home" (d4ed8b2f) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -3205,6 +3205,15 @@
		android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
		</activity>

		<activity
		android:name=".Settings$AppDashboardActivity"
		android:label="@string/apps_dashboard_title"
		android:icon="@drawable/ic_homepage_apps"
		android:exported="true">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.AppDashboardFragment"/>
		</activity>

		<activity
		android:name=".Settings$AccountDashboardActivity"
		android:label="@string/account_dashboard_title"

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -12607,4 +12607,6 @@
		<!-- Do not translate. Title for battery saver main switch preferences. [CHAR LIMIT=50] -->
		<string name="battery_saver_main_switch_title" translatable="false">Use battery saver</string>

		<!-- Default preference title for showing all apps on device [CHAR_LIMIT=50]-->
		<string name="default_see_all_apps_title">See all apps</string>
		</resources>

res/xml/apps.xml

+26 −54

Original line number	Diff line number	Diff line
		@@ -18,80 +18,52 @@
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="apps_and_notification_screen"
		android:title="@string/app_and_notification_dashboard_title"
		settings:initialExpandedChildrenCount="4">
		<!-- the initial count should include the dynamic tiles -->
		android:key="apps_screen"
		android:title="@string/apps_dashboard_title">

		<Preference
		android:key="all_app_info"
		android:title="@string/applications_settings"
		android:summary="@string/summary_placeholder"
		android:order="-999"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:controller="com.android.settings.applications.AllAppsInfoPreferenceController"
		settings:keywords="@string/keywords_applications_settings"/>

		<com.android.settingslib.widget.LayoutPreference
		android:key="recent_open_apps"
		<PreferenceCategory
		android:key="recent_apps_category"
		android:title="@string/recent_app_category_title"
		android:layout="@layout/app_entities_header"
		android:selectable="false"
		android:order="-998"
		settings:allowDividerBelow="true"
		settings:controller="com.android.settings.applications.RecentAppsPreferenceController"/>

		<!-- Empty category to draw divider -->
		<PreferenceCategory
		android:key="recent_apps_divider"
		android:layout="@layout/preference_category_no_label"
		android:order="-997"/>
		settings:searchable="false">
		<!-- Placeholder for a list of recent apps -->

		<!-- See all apps -->
		<Preference
		android:key="conversations"
		android:title="@string/conversations_category_title"
		android:order="-550"
		settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
		android:fragment="com.android.settings.notification.app.ConversationListSettings"
		/>
		android:key="see_all_apps"
		android:title="@string/default_see_all_apps_title"
		android:icon="@drawable/ic_chevron_right_24dp"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		android:order="5"
		settings:searchable="false">
		</Preference>
		</PreferenceCategory>

		<!-- Notifications (appears before manage_perms), default apps (appears after) -->
		<PreferenceCategory
		android:key="dashboard_tile_placeholder"
		android:order="10"/>
		android:key="general_category"
		android:title="@string/category_name_general"
		android:order="-997"
		android:visibility="gone"
		settings:searchable="false"/>

		<Preference
		android:key="default_apps"
		android:title="@string/app_default_dashboard_title"
		android:order="11"
		android:order="-996"
		settings:controller="com.android.settings.applications.DefaultAppsPreferenceController">
		<intent android:action="android.settings.MANAGE_DEFAULT_APPS_SETTINGS"/>
		</Preference>

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

		<com.android.settingslib.RestrictedPreference
		android:key="app_and_notif_cell_broadcast_settings"
		android:title="@string/cell_broadcast_settings"
		android:order="15"
		settings:useAdminDisabledSummary="true">
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="@string/cell_broadcast_receiver_package"
		android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
		</com.android.settingslib.RestrictedPreference>

		<Preference
		android:key="special_access"
		android:fragment="com.android.settings.applications.specialaccess.SpecialAccessSettings"
		android:title="@string/special_access"
		android:order="20"
		settings:controller="com.android.settings.applications.SpecialAppAccessPreferenceController"/>
		<PreferenceCategory
		android:key="dashboard_tile_placeholder"
		android:order="10"/>

		</PreferenceScreen>

res/xml/top_level_settings_grouped.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -41,9 +41,9 @@
		android:order="-120"
		settings:allowDividerAbove="false">
		<com.android.settings.homepage.HomepagePreference
		android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"
		android:fragment="com.android.settings.applications.AppDashboardFragment"
		android:icon="@drawable/ic_homepage_apps_v2"
		android:key="top_level_apps_and_notifs"
		android:key="top_level_apps"
		android:order="-120"
		android:title="@string/apps_dashboard_title"/>

		@@ -53,8 +53,6 @@
		android:key="top_level_notification"
		android:order="-110"
		android:title="@string/configure_notification_settings"/>


		</PreferenceCategory>

		<PreferenceCategory

src/com/android/settings/Settings.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -251,4 +251,8 @@ public class Settings extends SettingsActivity {
		*/
		public static class MediaControlsSettingsActivity extends SettingsActivity {}

		/**
		* Activity for AppDashboard.
		*/
		public static class AppDashboardActivity extends SettingsActivity {}
		}