Merge "Initial setup for widgets in Search" into ub-launcher3-master
diff --git a/res/layout/search_result_icon_row.xml b/res/layout/search_result_icon_row.xml
index 280bbc9..81c23e4 100644
--- a/res/layout/search_result_icon_row.xml
+++ b/res/layout/search_result_icon_row.xml
@@ -38,6 +38,7 @@
android:id="@id/title"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
+ android:maxLines="1"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/search_hero_title_size" />
@@ -45,6 +46,7 @@
<TextView
android:layout_width="wrap_content"
android:id="@+id/desc"
+ android:maxLines="1"
android:textColor="?android:attr/textColorTertiary"
android:textSize="@dimen/search_hero_subtitle_size"
android:layout_height="wrap_content" />
diff --git a/src/com/android/launcher3/views/SearchResultIconRow.java b/src/com/android/launcher3/views/SearchResultIconRow.java
index 03332c1..ecf5054 100644
--- a/src/com/android/launcher3/views/SearchResultIconRow.java
+++ b/src/com/android/launcher3/views/SearchResultIconRow.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.content.pm.ShortcutInfo;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Pair;
import android.view.View;
@@ -125,6 +126,12 @@
shortcutInfo.getUserHandle());
} else if (itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
showInlineShortcuts(mSearchTarget.getShortcutInfos());
+ } else if (itemType.equals(SearchResultIcon.TARGET_TYPE_REMOTE_ACTION)) {
+ CharSequence desc = mSearchTarget.getRemoteAction().getContentDescription();
+ if (!TextUtils.isEmpty(desc)) {
+ mDescriptionView.setVisibility(VISIBLE);
+ mDescriptionView.setText(desc);
+ }
}
if (!itemType.equals(SearchResultIcon.TARGET_TYPE_HERO_APP)) {
showInlineShortcuts(new ArrayList<>());