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 am: fadf32ffcb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13911068

Change-Id: Ifd46c3e8bf16cb56419c28fdf0c26403fac04d3b
This commit is contained in:
Yanting Yang
2021-03-18 09:34:49 +00:00
committed by Automerger Merge Worker
parent 900fc6d178 fadf32ffcb
commit c3e886142c
1 changed files with 100 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/xml/top_level_settings_grouped.xml
View File

@@ -36,10 +36,6 @@
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
android:key="apps"
android:order="-120"
settings:allowDividerAbove="false">
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.applications.AppDashboardFragment" android:fragment="com.android.settings.applications.AppDashboardFragment"
android:icon="@drawable/ic_homepage_apps_v2" android:icon="@drawable/ic_homepage_apps_v2"
@@ -53,12 +49,7 @@
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
android:key="phone_essential"
android:order="-100"
settings:allowDividerAbove="false">
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.fuelgauge.PowerUsageSummary" android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
android:icon="@drawable/ic_homepage_battery_v2" android:icon="@drawable/ic_homepage_battery_v2"
@@ -104,12 +95,7 @@
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
android:key="privacy_and_security"
android:order="-40"
settings:allowDividerAbove="false">
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.privacy.PrivacyDashboardFragment" android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
android:icon="@drawable/ic_homepage_privacy_v2" android:icon="@drawable/ic_homepage_privacy_v2"
@@ -139,12 +125,7 @@
android:icon="@drawable/ic_homepage_emergency_v2" android:icon="@drawable/ic_homepage_emergency_v2"
android:order="-10" android:order="-10"
android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/> android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
</PreferenceCategory>
<PreferenceCategory
android:key="accounts"
android:order="-10"
settings:allowDividerAbove="false">
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.accounts.AccountDashboardFragment" android:fragment="com.android.settings.accounts.AccountDashboardFragment"
android:icon="@drawable/ic_homepage_accounts_v2" android:icon="@drawable/ic_homepage_accounts_v2"
@@ -152,12 +133,7 @@
android:order="-10" android:order="-10"
android:title="@string/account_dashboard_title" android:title="@string/account_dashboard_title"
settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/> settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="system"
android:order="10"
settings:allowDividerAbove="false">
<com.android.settings.homepage.HomepagePreference <com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.system.SystemDashboardFragment" android:fragment="com.android.settings.system.SystemDashboardFragment"
android:icon="@drawable/ic_homepage_system_dashboard_v2" android:icon="@drawable/ic_homepage_system_dashboard_v2"
@@ -179,6 +155,5 @@
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>