diff options
author | Danesh Mondegarian <daneshm90@gmail.com> | 2013-09-15 21:27:47 -0700 |
---|---|---|
committer | Danesh Mondegarian <daneshm90@gmail.com> | 2013-09-29 20:06:51 -0700 |
commit | d0a92d6799a340fbbab924e0a128f189d6284e1c (patch) | |
tree | 49bae479f721dc829a619719aeddecef5d5ac1f5 /src/com/cyanogenmod/trebuchet/Workspace.java | |
parent | eead7ecc910af0f3cd07a660e0145e00c738128f (diff) | |
download | android_packages_apps_Trebuchet-d0a92d6799a340fbbab924e0a128f189d6284e1c.tar.gz android_packages_apps_Trebuchet-d0a92d6799a340fbbab924e0a128f189d6284e1c.tar.bz2 android_packages_apps_Trebuchet-d0a92d6799a340fbbab924e0a128f189d6284e1c.zip |
Trebuchet : Icon edit dialog fixes
Append text rather than setText for the edit dialog title, so that the
cursor moves to the end.
Keep track of customIconResource state to ensure its not reset.
Preserve custom icons when the linking application is updated
Change-Id: Icab0f0ce45f1dbb79ce895228303aa2c944f1213
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Workspace.java')
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index c4318a768..4dd4523ff 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -46,6 +46,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.IBinder; import android.os.Parcelable; +import android.text.TextUtils; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; @@ -4541,6 +4542,10 @@ public class Workspace extends PagedView } for (ApplicationInfo app : apps) { if (app.componentName.equals(name)) { + if (!TextUtils.isEmpty(info.customIconResource) + || !TextUtils.isEmpty(info.title)) { + continue; + } BubbleTextView shortcut = (BubbleTextView) view; info.updateIcon(mIconCache); info.title = app.title.toString(); |