summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author thiruram <thiruram@google.com> 2021-04-22 19:25:11 -0700
committer thiruram <thiruram@google.com> 2021-04-28 09:36:05 -0700
commit1987a42d3c08459fa8355344d0493b57ffa4684f (patch)
tree642f8d6a556c54e98ae502c10549bb30e55062e8
parent6bb08447662a49e3b0f2a71477c6ebd59df43822 (diff)
[AA+] Add SearchResult type to ItemInfo attributes.
Bug: 186169419 Test: Manual Change-Id: I9ea707e135eda163dfb3f12f48f4f0c37e6c044e
-rw-r--r--protos/launcher_atom.proto16
-rw-r--r--src/com/android/launcher3/model/data/ItemInfo.java2
2 files changed, 17 insertions, 1 deletions
diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto
index fe81b4cbeb..fb47b0aad6 100644
--- a/protos/launcher_atom.proto
+++ b/protos/launcher_atom.proto
@@ -125,6 +125,22 @@ enum Attribute {
// Folder's label is empty(i.e., title == "").
// Not eligible for auto-labeling.
EMPTY_LABEL = 12;
+
+ ALL_APPS_SEARCH_RESULT_APPLICATION = 13;
+ ALL_APPS_SEARCH_RESULT_SHORTCUT = 14;
+ ALL_APPS_SEARCH_RESULT_PEOPLE = 15;
+ ALL_APPS_SEARCH_RESULT_ACTION = 16;
+ ALL_APPS_SEARCH_RESULT_SETTING = 17;
+ ALL_APPS_SEARCH_RESULT_SCREENSHOT = 18;
+ ALL_APPS_SEARCH_RESULT_SLICE = 19;
+ ALL_APPS_SEARCH_RESULT_WIDGETS = 20;
+ ALL_APPS_SEARCH_RESULT_PLAY = 21;
+ ALL_APPS_SEARCH_RESULT_SUGGEST = 22;
+ ALL_APPS_SEARCH_RESULT_ASSISTANT = 23;
+ ALL_APPS_SEARCH_RESULT_CHROMETAB = 24;
+ ALL_APPS_SEARCH_RESULT_NAVVYSITE = 25;
+ ALL_APPS_SEARCH_RESULT_TIPS = 26;
+ ALL_APPS_SEARCH_RESULT_PEOPLE_TILE = 27;
}
// Main app icons
diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java
index 05fd77d720..e388965e91 100644
--- a/src/com/android/launcher3/model/data/ItemInfo.java
+++ b/src/com/android/launcher3/model/data/ItemInfo.java
@@ -366,7 +366,7 @@ public class ItemInfo {
return itemBuilder.build();
}
- LauncherAtom.ItemInfo.Builder getDefaultItemInfoBuilder() {
+ protected LauncherAtom.ItemInfo.Builder getDefaultItemInfoBuilder() {
LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();
itemBuilder.setIsWork(user != Process.myUserHandle());
return itemBuilder;