From 1987a42d3c08459fa8355344d0493b57ffa4684f Mon Sep 17 00:00:00 2001 From: thiruram Date: Thu, 22 Apr 2021 19:25:11 -0700 Subject: [PATCH] [AA+] Add SearchResult type to ItemInfo attributes. Bug: 186169419 Test: Manual Change-Id: I9ea707e135eda163dfb3f12f48f4f0c37e6c044e --- protos/launcher_atom.proto | 16 ++++++++++++++++ .../android/launcher3/model/data/ItemInfo.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) 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;