Merge "Remove grouping from homepage" into sc-dev am: fadf32ffcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13911068 Change-Id: Ifd46c3e8bf16cb56419c28fdf0c26403fac04d3b
This commit is contained in:
Yanting Yang
Automerger Merge Worker
@@ -36,149 +36,124 @@
|
||||
android:title="@string/connected_devices_dashboard_title"
|
||||
settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="apps"
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.applications.AppDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_apps_v2"
|
||||
android:key="top_level_apps"
|
||||
android:order="-120"
|
||||
settings:allowDividerAbove="false">
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.applications.AppDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_apps_v2"
|
||||
android:key="top_level_apps"
|
||||
android:order="-120"
|
||||
android:title="@string/apps_dashboard_title"/>
|
||||
android:title="@string/apps_dashboard_title"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
|
||||
android:icon="@drawable/ic_homepage_notification_v2"
|
||||
android:key="top_level_notification"
|
||||
android:order="-110"
|
||||
android:title="@string/configure_notification_settings"/>
|
||||
</PreferenceCategory>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
|
||||
android:icon="@drawable/ic_homepage_notification_v2"
|
||||
android:key="top_level_notification"
|
||||
android:order="-110"
|
||||
android:title="@string/configure_notification_settings"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="phone_essential"
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
|
||||
android:icon="@drawable/ic_homepage_battery_v2"
|
||||
android:key="top_level_battery"
|
||||
android:order="-100"
|
||||
settings:allowDividerAbove="false">
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
|
||||
android:icon="@drawable/ic_homepage_battery_v2"
|
||||
android:key="top_level_battery"
|
||||
android:order="-100"
|
||||
android:title="@string/power_usage_summary_title"
|
||||
settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
|
||||
android:title="@string/power_usage_summary_title"
|
||||
settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.deviceinfo.StorageSettings"
|
||||
android:icon="@drawable/ic_homepage_storage_v2"
|
||||
android:key="top_level_storage"
|
||||
android:order="-90"
|
||||
android:title="@string/storage_settings"
|
||||
settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.deviceinfo.StorageSettings"
|
||||
android:icon="@drawable/ic_homepage_storage_v2"
|
||||
android:key="top_level_storage"
|
||||
android:order="-90"
|
||||
android:title="@string/storage_settings"
|
||||
settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.notification.SoundSettings"
|
||||
android:icon="@drawable/ic_homepage_sound_v2"
|
||||
android:key="top_level_sound"
|
||||
android:order="-80"
|
||||
android:title="@string/sound_settings"/>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.notification.SoundSettings"
|
||||
android:icon="@drawable/ic_homepage_sound_v2"
|
||||
android:key="top_level_sound"
|
||||
android:order="-80"
|
||||
android:title="@string/sound_settings"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.DisplaySettings"
|
||||
android:icon="@drawable/ic_homepage_display_v2"
|
||||
android:key="top_level_display"
|
||||
android:order="-70"
|
||||
android:title="@string/display_settings"
|
||||
settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.DisplaySettings"
|
||||
android:icon="@drawable/ic_homepage_display_v2"
|
||||
android:key="top_level_display"
|
||||
android:order="-70"
|
||||
android:title="@string/display_settings"
|
||||
settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.RestrictedHomepagePreference
|
||||
android:icon="@drawable/ic_homepage_wallpaper_v2"
|
||||
android:key="top_level_wallpaper"
|
||||
android:order="-60"
|
||||
android:title="@string/wallpaper_settings_title"
|
||||
settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
|
||||
<com.android.settings.homepage.RestrictedHomepagePreference
|
||||
android:icon="@drawable/ic_homepage_wallpaper_v2"
|
||||
android:key="top_level_wallpaper"
|
||||
android:order="-60"
|
||||
android:title="@string/wallpaper_settings_title"
|
||||
settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.accessibility.AccessibilitySettings"
|
||||
android:icon="@drawable/ic_homepage_accessibility_v2"
|
||||
android:key="top_level_accessibility"
|
||||
android:order="-50"
|
||||
android:title="@string/accessibility_settings"
|
||||
settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.accessibility.AccessibilitySettings"
|
||||
android:icon="@drawable/ic_homepage_accessibility_v2"
|
||||
android:key="top_level_accessibility"
|
||||
android:order="-50"
|
||||
android:title="@string/accessibility_settings"
|
||||
settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="privacy_and_security"
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_privacy_v2"
|
||||
android:key="top_level_privacy"
|
||||
android:order="-40"
|
||||
settings:allowDividerAbove="false">
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_privacy_v2"
|
||||
android:key="top_level_privacy"
|
||||
android:order="-40"
|
||||
android:title="@string/privacy_dashboard_title"/>
|
||||
android:title="@string/privacy_dashboard_title"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.location.LocationSettings"
|
||||
android:icon="@drawable/ic_homepage_location_v2"
|
||||
android:key="top_level_location"
|
||||
android:order="-30"
|
||||
android:title="@string/location_settings_title"
|
||||
settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.location.LocationSettings"
|
||||
android:icon="@drawable/ic_homepage_location_v2"
|
||||
android:key="top_level_location"
|
||||
android:order="-30"
|
||||
android:title="@string/location_settings_title"
|
||||
settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.security.SecuritySettings"
|
||||
android:icon="@drawable/ic_homepage_security_v2"
|
||||
android:key="top_level_security"
|
||||
android:order="-20"
|
||||
android:title="@string/security_settings_title"
|
||||
settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.security.SecuritySettings"
|
||||
android:icon="@drawable/ic_homepage_security_v2"
|
||||
android:key="top_level_security"
|
||||
android:order="-20"
|
||||
android:title="@string/security_settings_title"
|
||||
settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:key="top_level_emergency"
|
||||
android:title="@string/emergency_settings_preference_title"
|
||||
android:icon="@drawable/ic_homepage_emergency_v2"
|
||||
android:order="-10"
|
||||
android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="accounts"
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:key="top_level_emergency"
|
||||
android:title="@string/emergency_settings_preference_title"
|
||||
android:icon="@drawable/ic_homepage_emergency_v2"
|
||||
android:order="-10"
|
||||
settings:allowDividerAbove="false">
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.accounts.AccountDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_accounts_v2"
|
||||
android:key="top_level_accounts"
|
||||
android:order="-10"
|
||||
android:title="@string/account_dashboard_title"
|
||||
settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="system"
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.accounts.AccountDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_accounts_v2"
|
||||
android:key="top_level_accounts"
|
||||
android:order="-10"
|
||||
android:title="@string/account_dashboard_title"
|
||||
settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.system.SystemDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_system_dashboard_v2"
|
||||
android:key="top_level_system"
|
||||
android:order="10"
|
||||
settings:allowDividerAbove="false">
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.system.SystemDashboardFragment"
|
||||
android:icon="@drawable/ic_homepage_system_dashboard_v2"
|
||||
android:key="top_level_system"
|
||||
android:order="10"
|
||||
android:title="@string/header_category_system"/>
|
||||
android:title="@string/header_category_system"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
|
||||
android:icon="@drawable/ic_homepage_about_v2"
|
||||
android:key="top_level_about_device"
|
||||
android:order="20"
|
||||
android:title="@string/about_settings"
|
||||
settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
|
||||
android:icon="@drawable/ic_homepage_about_v2"
|
||||
android:key="top_level_about_device"
|
||||
android:order="20"
|
||||
android:title="@string/about_settings"
|
||||
settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
|
||||
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:icon="@drawable/ic_homepage_support_v2"
|
||||
android:key="top_level_support"
|
||||
android:order="100"
|
||||
android:title="@string/page_tab_title_support"
|
||||
settings:controller="com.android.settings.support.SupportPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
<com.android.settings.homepage.HomepagePreference
|
||||
android:icon="@drawable/ic_homepage_support_v2"
|
||||
android:key="top_level_support"
|
||||
android:order="100"
|
||||
android:title="@string/page_tab_title_support"
|
||||
settings:controller="com.android.settings.support.SupportPreferenceController"/>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user