Snap for 7122685 from 7c86dcca7f6e4d10bd3c3572bfa47042b185d748 to sc-release (7a75585b) · Commits · e / os / android_frameworks_libs_systemui

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

+21 −24

Original line number	Diff line number	Diff line
		@@ -25,37 +25,30 @@ public class LayoutType {
		// \| icon \|
		// ------
		// text
		//
		public static final String ICON_SINGLE_VERTICAL_TEXT = "icon";

		// ------
		// \| icon \| text
		// ------
		public static final String ICON_SINGLE_HORIZONTAL_TEXT = "icon_text_row";

		// Below three layouts (to be deprecated) and two layouts render
		// {@link SearchTarget}s in following layout.
		// ------ ------ ------
		// \| icon \| text \| icon \| \| icon \|
		// \| \| title \|(opt)\| \|(opt)\|
		// \| icon \| subtitle (optional) \| icon\| \| icon\|
		// ------ ------ ------
		public static final String ICON_INLINE_ICONS = "icon_text_icons";

		// ------
		// \| \| text1
		// \| icon \| text2
		// ------
		@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";

		// 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
		public static final String ICON_SLICE = "slice";

		// TODO: add diagram
		public static final String TEXT_HEADER = "header";

		// This layout contains an icon and slice
		public static final String ICON_SLICE = "slice";

		// Widget bitmap preview
		public static final String WIDGET_PREVIEW = "widget_preview";
		@@ -63,5 +56,9 @@ public class LayoutType {
		// 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";
		}

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -18,18 +18,26 @@ package com.android.app.search;

		/**
		* 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;
		}