commit b5d4de5298821a324a93a7d34bdffa5c425e2f8b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 29 22:54:55 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 29 22:54:55 2021 +0000
tree 97615f4e332b6933c3ecd5a18fdac586dd816973
parent ae9418a4086709e79bbdc6c496839b7116f60c43
parent fa4779c88667b1a08a2e9bc6d214d15fea3d6c55

Merge "On device search UI template name cleanup" into sc-dev am: fa4779c886

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/14356062

Change-Id: I6e92cbf342d709ee5eaa4e186f155c041ac16189

searchuilib/src/com/android/app/search/LayoutType.java

diff --git a/searchuilib/src/com/android/app/search/LayoutType.java b/searchuilib/src/com/android/app/search/LayoutType.java
index cf27e2b..5a88aad 100644
--- a/searchuilib/src/com/android/app/search/LayoutType.java
+++ b/searchuilib/src/com/android/app/search/LayoutType.java
@@ -27,22 +27,14 @@
     //      text
     public static final String ICON_SINGLE_VERTICAL_TEXT = "icon";
 
-    // Below three layouts (to be deprecated) and two layouts render
+    // Below three layouts render
     // {@link SearchTarget}s in following layout.
     //     ------                            ------   ------
     //    |      | title                    |(opt)|  |(opt)|
     //    | icon | subtitle (optional)      | icon|  | icon|
     //     ------                            ------  ------
-    @Deprecated
-    public static final String ICON_SINGLE_HORIZONTAL_TEXT = "icon_text_row";
-    @Deprecated
-    public static final String ICON_DOUBLE_HORIZONTAL_TEXT = "icon_texts_row";
-    @Deprecated
-    public static final String ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON = "icon_texts_button";
-
-    // will replace ICON_DOUBLE_* ICON_SINGLE_* layouts
     public static final String ICON_HORIZONTAL_TEXT = "icon_row";
-    public static final String HORIZONTAL_MEDIUM_TEXT = "icon_row_medium";
+    public static final String MEDIUM_ICON_HORIZONTAL_TEXT = "medium_icon_row";
     public static final String SMALL_ICON_HORIZONTAL_TEXT = "short_icon_row";
 
     // This layout creates square thumbnail image (currently 3 column)