Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fadf32ff authored by Yanting Yang's avatar Yanting Yang Committed by Android (Google) Code Review
Browse files

Merge "Remove grouping from homepage" into sc-dev

parents cb64ea60 395f26a6
Loading
Loading
Loading
Loading
+114 −139
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@
        android:title="@string/connected_devices_dashboard_title"
        settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>

    <PreferenceCategory
        android:key="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"
@@ -53,12 +49,7 @@
        android:key="top_level_notification"
        android:order="-110"
        android:title="@string/configure_notification_settings"/>
    </PreferenceCategory>

    <PreferenceCategory
        android:key="phone_essential"
        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"
@@ -104,12 +95,7 @@
        android:order="-50"
        android:title="@string/accessibility_settings"
        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
        android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
        android:icon="@drawable/ic_homepage_privacy_v2"
@@ -139,12 +125,7 @@
        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"
        settings:allowDividerAbove="false">
    <com.android.settings.homepage.HomepagePreference
        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
        android:icon="@drawable/ic_homepage_accounts_v2"
@@ -152,12 +133,7 @@
        android:order="-10"
        android:title="@string/account_dashboard_title"
        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
    </PreferenceCategory>

    <PreferenceCategory
        android:key="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"
@@ -179,6 +155,5 @@
        android:order="100"
        android:title="@string/page_tab_title_support"
        settings:controller="com.android.settings.support.SupportPreferenceController"/>
    </PreferenceCategory>

</PreferenceScreen>