commit 724963448feb9213fd70ef631390e06e19e506b4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 18 17:58:24 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 18 17:58:24 2022 +0000
tree 8014c7bb921535bdee0ff0d3bfabc442dcb1139a
parent f6f5b1877726196cad770055cb812c6da5d6b2ae
parent 7798fb6e3087158f053fa3d8f95a83d6764f3a04

Merge "Fixes ITEM_TYPE_SEARCH_ACTION to have a unique value." into tm-qpr-dev am: 7798fb6e30

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20125070

Change-Id: I2211801f0614ff5339994261cc2cb308f00ecece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/LauncherSettings.java

diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 66195f3..4c8f2d9 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -94,15 +94,11 @@
          */
         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;
 
@@ -112,6 +108,11 @@
         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>
          */