From f48c89ff7c383dc8891f552a125b2c7d395836b1 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Wed, 3 Jun 2015 13:18:07 -0400
Subject: [PATCH] Reorder device category

Bug: 21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c
---
 res/xml/dashboard_categories.xml             | 26 ++++++++++----------
 src/com/android/settings/search/Ranking.java |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index ebddd789ec0..c839792ac9f 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -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"
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 93e09487a8e..5d987faf486 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -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;