Add DIVIDER constant to LayoutType class
Bug: 178815297
Test: manual
Change-Id: Ib1002bf1f4276b4ac680f9865fa644d236c87db9
diff --git a/searchuilib/src/com/android/app/search/LayoutType.java b/searchuilib/src/com/android/app/search/LayoutType.java
index d1accfb..9661b7c 100644
--- a/searchuilib/src/com/android/app/search/LayoutType.java
+++ b/searchuilib/src/com/android/app/search/LayoutType.java
@@ -25,43 +25,40 @@
// | icon |
// ------
// text
- //
public static final String ICON_SINGLE_VERTICAL_TEXT = "icon";
- // ------
- // | icon | text
- // ------
+ // Below three layouts (to be deprecated) and two 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";
-
- // ------ ------ ------
- // | icon | text | icon | | icon |
- // ------ ------ ------
- public static final String ICON_INLINE_ICONS = "icon_text_icons";
-
- // ------
- // | | text1
- // | icon | text2
- // ------
+ @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";
- // TODO: add diagram
- 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 SMALL_ICON_HORIZONTAL_TEXT = "short_icon_row";
-
+ // This layout creates square thumbnail image (currently 3 column)
public static final String THUMBNAIL = "thumbnail";
- // TODO: add diagram
+
+ // This layout contains an icon and slice
public static final String ICON_SLICE = "slice";
- // TODO: add diagram
- public static final String TEXT_HEADER = "header";
-
-
// Widget bitmap preview
public static final String WIDGET_PREVIEW = "widget_preview";
// Live widget search result
public static final String WIDGET_LIVE = "widget_live";
- // TODO: replace the plugin item types with these string constants
+ // text based header to group various layouts in low confidence section of the results.
+ public static final String TEXT_HEADER = "header";
+
+ // horizontal bar to be inserted between fallback search results and low confidence section
+ public static final String DIVIDER = "divider";
}
diff --git a/searchuilib/src/com/android/app/search/ResultType.java b/searchuilib/src/com/android/app/search/ResultType.java
index 670912a..c53cc30 100644
--- a/searchuilib/src/com/android/app/search/ResultType.java
+++ b/searchuilib/src/com/android/app/search/ResultType.java
@@ -18,18 +18,26 @@
/**
* Constants to be used with {@link android.app.search.SearchContext} and
- * {@link android.app.search.SearchInfo}.
+ * {@link android.app.search.SearchTarget}.
+ *
+ * Note, a result type could be a of two types.
+ * For example, unpublished settings result type could be in slices:
+ * <code> resultType = SETTING | SLICE </code>
*/
public class ResultType {
+ // published corpus by 3rd party app, supported by SystemService
public static final int APPLICATION = 1 << 0;
public static final int SHORTCUT = 1 << 1;
+ public static final int SLICE = 1 << 6;
+ public static final int WIDGETS = 1 << 7;
+
+ // Not extracted from any of the SystemService
public static final int PEOPLE = 1 << 2;
public static final int ACTION = 1 << 3;
public static final int SETTING = 1 << 4;
public static final int SCREENSHOT = 1 << 5;
- public static final int TIPS = 1 << 6;
- public static final int WIDGETS = 1 << 7;
public static final int PLAY = 1 << 8;
public static final int SUGGEST = 1 << 9;
+ public static final int ASSISTANT = 1 << 10;
}