Merge "Fixes ITEM_TYPE_SEARCH_ACTION to have a unique value." into tm-qpr-dev

src/com/android/launcher3/LauncherSettings.java

@@ -94,15 +94,11 @@ public class LauncherSettings {
          */
         public static final int ITEM_TYPE_DEEP_SHORTCUT = 6;
 
-        /**
-         * The favroite is a search action
-         */
-        public static final int ITEM_TYPE_SEARCH_ACTION = 7;
 
+        // *** Below enum values are used for metrics purpose but not used in Favorites DB ***
 
         /**
          * Type of the item is recents task.
-         * TODO(hyunyoungs): move constants not related to Favorites DB to a better location.
          */
         public static final int ITEM_TYPE_TASK = 7;
 
@@ -111,6 +107,11 @@ public class LauncherSettings {
          */
         public static final int ITEM_TYPE_QSB = 8;
 
+        /**
+         * The favorite is a search action
+         */
+        public static final int ITEM_TYPE_SEARCH_ACTION = 9;
+
         /**
          * The icon package name in Intent.ShortcutIconResource
          * <P>Type: TEXT</P>