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

Merge "Remove grouping from homepage" into sc-dev

Browse Source
This commit is contained in:
Yanting Yang
2021-03-18 08:57:37 +00:00
committed by Android (Google) Code Review
parent cb64ea60c2 395f26a66e
commit fadf32ffcb
1 changed files with 100 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
res/xml/top_level_settings_grouped.xml
View File

@@ -36,149 +36,124 @@
android:title="@string/connected_devices_dashboard_title" android:title="@string/connected_devices_dashboard_title"
settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/> settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
<PreferenceCategory <com.android.settings.homepage.HomepagePreference
android:key="apps" android:fragment="com.android.settings.applications.AppDashboardFragment"
android:icon="@drawable/ic_homepage_apps_v2"
android:key="top_level_apps"
android:order="-120" android:order="-120"
settings:allowDividerAbove="false"> android:title="@string/apps_dashboard_title"/>
<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"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.notification.ConfigureNotificationSettings" android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
android:icon="@drawable/ic_homepage_notification_v2" android:icon="@drawable/ic_homepage_notification_v2"
android:key="top_level_notification" android:key="top_level_notification"
android:order="-110" android:order="-110"
android:title="@string/configure_notification_settings"/> android:title="@string/configure_notification_settings"/>
</PreferenceCategory>
<PreferenceCategory <com.android.settings.homepage.HomepagePreference
android:key="phone_essential" android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
android:icon="@drawable/ic_homepage_battery_v2"
android:key="top_level_battery"
android:order="-100" android:order="-100"
settings:allowDividerAbove="false"> android:title="@string/power_usage_summary_title"
<com.android.settings.homepage.HomepagePreference settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
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"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.deviceinfo.StorageSettings" android:fragment="com.android.settings.deviceinfo.StorageSettings"
android:icon="@drawable/ic_homepage_storage_v2" android:icon="@drawable/ic_homepage_storage_v2"
android:key="top_level_storage" android:key="top_level_storage"
android:order="-90" android:order="-90"
android:title="@string/storage_settings" android:title="@string/storage_settings"
settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/> settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.notification.SoundSettings" android:fragment="com.android.settings.notification.SoundSettings"
android:icon="@drawable/ic_homepage_sound_v2" android:icon="@drawable/ic_homepage_sound_v2"
android:key="top_level_sound" android:key="top_level_sound"
android:order="-80" android:order="-80"
android:title="@string/sound_settings"/> android:title="@string/sound_settings"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.DisplaySettings" android:fragment="com.android.settings.DisplaySettings"
android:icon="@drawable/ic_homepage_display_v2" android:icon="@drawable/ic_homepage_display_v2"
android:key="top_level_display" android:key="top_level_display"
android:order="-70" android:order="-70"
android:title="@string/display_settings" android:title="@string/display_settings"
settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/> settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
<com.android.settings.homepage.RestrictedHomepagePreference <com.android.settings.homepage.RestrictedHomepagePreference
android:icon="@drawable/ic_homepage_wallpaper_v2" android:icon="@drawable/ic_homepage_wallpaper_v2"
android:key="top_level_wallpaper" android:key="top_level_wallpaper"
android:order="-60" android:order="-60"
android:title="@string/wallpaper_settings_title" android:title="@string/wallpaper_settings_title"
settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/> settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.accessibility.AccessibilitySettings" android:fragment="com.android.settings.accessibility.AccessibilitySettings"
android:icon="@drawable/ic_homepage_accessibility_v2" android:icon="@drawable/ic_homepage_accessibility_v2"
android:key="top_level_accessibility" android:key="top_level_accessibility"
android:order="-50" android:order="-50"
android:title="@string/accessibility_settings" android:title="@string/accessibility_settings"
settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/> settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory <com.android.settings.homepage.HomepagePreference
android:key="privacy_and_security" android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
android:icon="@drawable/ic_homepage_privacy_v2"
android:key="top_level_privacy"
android:order="-40" android:order="-40"
settings:allowDividerAbove="false"> android:title="@string/privacy_dashboard_title"/>
<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"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.location.LocationSettings" android:fragment="com.android.settings.location.LocationSettings"
android:icon="@drawable/ic_homepage_location_v2" android:icon="@drawable/ic_homepage_location_v2"
android:key="top_level_location" android:key="top_level_location"
android:order="-30" android:order="-30"
android:title="@string/location_settings_title" android:title="@string/location_settings_title"
settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/> settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.security.SecuritySettings" android:fragment="com.android.settings.security.SecuritySettings"
android:icon="@drawable/ic_homepage_security_v2" android:icon="@drawable/ic_homepage_security_v2"
android:key="top_level_security" android:key="top_level_security"
android:order="-20" android:order="-20"
android:title="@string/security_settings_title" android:title="@string/security_settings_title"
settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/> settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:key="top_level_emergency" android:key="top_level_emergency"
android:title="@string/emergency_settings_preference_title" android:title="@string/emergency_settings_preference_title"
android:icon="@drawable/ic_homepage_emergency_v2" android:icon="@drawable/ic_homepage_emergency_v2"
android:order="-10"
android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
</PreferenceCategory>
<PreferenceCategory
android:key="accounts"
android:order="-10" android:order="-10"
settings:allowDividerAbove="false"> android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
<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>
<PreferenceCategory <com.android.settings.homepage.HomepagePreference
android:key="system" 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" android:order="10"
settings:allowDividerAbove="false"> android:title="@string/header_category_system"/>
<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"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment" android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
android:icon="@drawable/ic_homepage_about_v2" android:icon="@drawable/ic_homepage_about_v2"
android:key="top_level_about_device" android:key="top_level_about_device"
android:order="20" android:order="20"
android:title="@string/about_settings" android:title="@string/about_settings"
settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/> settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:icon="@drawable/ic_homepage_support_v2" android:icon="@drawable/ic_homepage_support_v2"
android:key="top_level_support" android:key="top_level_support"
android:order="100" android:order="100"
android:title="@string/page_tab_title_support" android:title="@string/page_tab_title_support"
settings:controller="com.android.settings.support.SupportPreferenceController"/> settings:controller="com.android.settings.support.SupportPreferenceController"/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>