summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/widget
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-05-08 17:00:10 -0700
committerWinson Chung <winsonc@google.com>2015-05-08 22:22:39 -0700
commit82b016cb56540fe26213e817dd0dd668099c8e20 (patch)
tree528066331689070902b505306abaecbbfbf648d0 /src/com/android/launcher3/widget
parent99d96ba6c8e3258f7d99a33d49da2aeb0da5d862 (diff)
downloadandroid_packages_apps_Trebuchet-82b016cb56540fe26213e817dd0dd668099c8e20.tar.gz
android_packages_apps_Trebuchet-82b016cb56540fe26213e817dd0dd668099c8e20.tar.bz2
android_packages_apps_Trebuchet-82b016cb56540fe26213e817dd0dd668099c8e20.zip
Trim all whitespace from titles and labels.
Bug: 20953160 Change-Id: I1610df5e445a4139522226f68fa6439926bc70c6
Diffstat (limited to 'src/com/android/launcher3/widget')
-rw-r--r--src/com/android/launcher3/widget/PackageItemInfo.java2
-rw-r--r--src/com/android/launcher3/widget/WidgetCell.java7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher3/widget/PackageItemInfo.java b/src/com/android/launcher3/widget/PackageItemInfo.java
index 1a1de55c2..8f45a7754 100644
--- a/src/com/android/launcher3/widget/PackageItemInfo.java
+++ b/src/com/android/launcher3/widget/PackageItemInfo.java
@@ -49,7 +49,7 @@ public class PackageItemInfo extends ItemInfo {
@Override
public String toString() {
- return "PackageItemInfo(title=" + title.toString() + " id=" + this.id
+ return "PackageItemInfo(title=" + title + " id=" + this.id
+ " type=" + this.itemType + " container=" + this.container
+ " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY
+ " spanX=" + spanX + " spanY=" + spanY + " dropPos=" + Arrays.toString(dropPos)
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 2df170eff..27b7e6df5 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -222,10 +222,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
* Helper method to get the string info of the tag.
*/
private String getTagToString() {
- if (getTag() instanceof PendingAddWidgetInfo) {
- return ((PendingAddWidgetInfo)getTag()).toString();
- } else if (getTag() instanceof PendingAddShortcutInfo) {
- return ((PendingAddShortcutInfo)getTag()).toString();
+ if (getTag() instanceof PendingAddWidgetInfo ||
+ getTag() instanceof PendingAddShortcutInfo) {
+ return getTag().toString();
}
return "";
}