diff options
-rw-r--r-- | res/layout/widget_cell.xml | 2 | ||||
-rw-r--r-- | res/layout/widgets_list_row_view.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/widget/WidgetCell.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/widget/WidgetsListAdapter.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/widget/WidgetsModel.java | 4 |
5 files changed, 9 insertions, 2 deletions
diff --git a/res/layout/widget_cell.xml b/res/layout/widget_cell.xml index 1286a622b..9e91f677e 100644 --- a/res/layout/widget_cell.xml +++ b/res/layout/widget_cell.xml @@ -41,7 +41,7 @@ android:layout_weight="1" android:gravity="start" android:singleLine="true" - android:ellipsize="marquee" + android:ellipsize="end" android:fadingEdge="horizontal" android:textColor="#FFFFFFFF" diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml index c7863c7c3..017b45066 100644 --- a/res/layout/widgets_list_row_view.xml +++ b/res/layout/widgets_list_row_view.xml @@ -52,6 +52,8 @@ android:paddingTop="8dp" android:paddingLeft="16dp" android:paddingRight="16dp" + android:singleLine="true" + android:ellipsize="end" android:gravity="start|center_vertical" android:textColor="@color/widgets_view_section_text_color" android:background="@color/widget_text_panel" diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index ccd67ce41..93ee94a59 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -120,7 +120,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { Log.d(TAG, String.format("[tag=%s] onDetachedFromWindow", getTagToString())); } super.onDetachedFromWindow(); - deletePreview(false); + deletePreview(true); } public void deletePreview(boolean recycleImage) { diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index d0d1e60b4..8d1f20c0c 100644 --- a/src/com/android/launcher3/widget/WidgetsListAdapter.java +++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java @@ -124,6 +124,7 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { if (infoOut.usingLowResIcon) { mIconCache.getTitleAndIconForApp(packageName, UserHandleCompat.myUserHandle(), false /* useLowResIcon */, infoOut); + mWidgetsModel.setPackageItemInfo(packageName, infoOut); } ((TextView) holder.getContent().findViewById(R.id.section)).setText(infoOut.title); ImageView iv = (ImageView) holder.getContent().findViewById(R.id.section_image); diff --git a/src/com/android/launcher3/widget/WidgetsModel.java b/src/com/android/launcher3/widget/WidgetsModel.java index c400d6366..463c79ec2 100644 --- a/src/com/android/launcher3/widget/WidgetsModel.java +++ b/src/com/android/launcher3/widget/WidgetsModel.java @@ -133,4 +133,8 @@ public class WidgetsModel { } }); } + + public void setPackageItemInfo(String packageName, PackageItemInfo infoOut) { + mPackageItemInfoList.put(packageName, infoOut); + } } |