From a508e4f804c2bddf9e2cdfa3d0bd4a8202ff2151 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 21 May 2015 09:33:57 -0700 Subject: [PATCH] Do not trim folder title Bug: 21297281 Change-Id: I633780f8207aabc8362f016e6b5a6e720cee1b86 --- src/com/android/launcher3/FolderInfo.java | 2 +- src/com/android/launcher3/LauncherModel.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java index 930f911038..aea21c95b5 100644 --- a/src/com/android/launcher3/FolderInfo.java +++ b/src/com/android/launcher3/FolderInfo.java @@ -92,7 +92,7 @@ public class FolderInfo extends ItemInfo { } public void setTitle(CharSequence title) { - this.title = Utilities.trim(title); + this.title = title; for (int i = 0; i < listeners.size(); i++) { listeners.get(i).onTitleChanged(title); } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 3e05f57b91..ad176aeca3 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -968,7 +968,8 @@ public class LauncherModel extends BroadcastReceiver break; } - folderInfo.title = Utilities.trim(c.getString(titleIndex)); + // Do not trim the folder label, as is was set by the user. + folderInfo.title = c.getString(titleIndex); folderInfo.id = id; folderInfo.container = c.getInt(containerIndex); folderInfo.screenId = c.getInt(screenIndex); @@ -2110,7 +2111,8 @@ public class LauncherModel extends BroadcastReceiver id = c.getLong(idIndex); FolderInfo folderInfo = findOrMakeFolder(sBgFolders, id); - folderInfo.title = Utilities.trim(c.getString(titleIndex)); + // Do not trim the folder label, as is was set by the user. + folderInfo.title = c.getString(titleIndex); folderInfo.id = id; container = c.getInt(containerIndex); folderInfo.container = container;