Add drag handle to shortcuts.

Also use short text if long text is ellipsized.

Bug: 30212144
Bug: 28980830
Change-Id: I213766bca0561d284d1da883ca37b0a42d886129
This commit is contained in:
Tony Wickham
2016-07-20 15:21:04 -07:00
parent 2eeae10e98
commit 377ed3f63e
6 changed files with 102 additions and 15 deletions

View File

@@ -526,19 +526,23 @@ public class BubbleTextView extends TextView
* Sets the icon for this view based on the layout direction.
*/
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public void setIcon(Drawable icon) {
private void setIcon(Drawable icon) {
mIcon = icon;
if (mIconSize != -1) {
mIcon.setBounds(0, 0, mIconSize, mIconSize);
}
applyCompoundDrawables(mIcon);
}
protected void applyCompoundDrawables(Drawable icon) {
if (mLayoutHorizontal) {
if (Utilities.ATLEAST_JB_MR1) {
setCompoundDrawablesRelative(mIcon, null, null, null);
setCompoundDrawablesRelative(icon, null, null, null);
} else {
setCompoundDrawables(mIcon, null, null, null);
setCompoundDrawables(icon, null, null, null);
}
} else {
setCompoundDrawables(null, mIcon, null, null);
setCompoundDrawables(null, icon, null, null);
}
}