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

Commit e6d7623c authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Reorder device category" into mnc-dev

parents ef0b4362 f48c89ff

res/xml/dashboard_categories.xml

+13 −13
Original line number Diff line number Diff line
@@ -102,6 +102,14 @@ 
                android:icon="@drawable/ic_settings_notifications"

                />



        <!-- Application Settings -->

        <dashboard-tile

                android:id="@+id/application_settings"

                android:title="@string/applications_settings"

                android:fragment="com.android.settings.applications.ManageApplications"

                android:icon="@drawable/ic_settings_applications"

                />



        <!-- Storage -->

        <dashboard-tile

                android:id="@+id/storage_settings"
@@ -118,12 +126,12 @@ 
                android:icon="@drawable/ic_settings_battery"

                />



        <!-- Application Settings -->

        <!-- Memory -->

        <dashboard-tile

                android:id="@+id/application_settings"

                android:title="@string/applications_settings"

                android:fragment="com.android.settings.applications.ManageApplications"

                android:icon="@drawable/ic_settings_applications"

                android:id="@+id/manage_memory"

                android:title="@string/memory_settings_title"

                android:fragment="com.android.settings.applications.ProcessStatsSummary"

                android:icon="@drawable/ic_settings_memory"

                />



        <!-- Manage users -->
@@ -134,14 +142,6 @@ 
                android:icon="@drawable/ic_settings_multiuser"

                />



        <!-- Memory -->

        <dashboard-tile

                android:id="@+id/manage_memory"

                android:title="@string/memory_settings_title"

                android:fragment="com.android.settings.applications.ProcessStatsSummary"

                android:icon="@drawable/ic_settings_memory"

                />



        <!-- Manage NFC payment apps -->

        <dashboard-tile

                android:id="@+id/nfc_payment_settings"

src/com/android/settings/search/Ranking.java

+3 −3
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ public final class Ranking { 
    public static final int RANK_DISPLAY = 7;

    public static final int RANK_WALLPAPER = 8;

    public static final int RANK_NOTIFICATIONS = 9;

    public static final int RANK_STORAGE = 10;

    public static final int RANK_POWER_USAGE = 11;

    public static final int RANK_APPS = 12;

    public static final int RANK_APPS = 10;

    public static final int RANK_STORAGE = 11;

    public static final int RANK_POWER_USAGE = 12;

    public static final int RANK_USERS = 13;

    public static final int RANK_LOCATION = 14;

    public static final int RANK_SECURITY = 15;