diff options
| author | Winson Chung <winsonc@google.com> | 2015-05-11 20:06:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 20:06:17 +0000 |
| commit | 485693c9eff4b10e7c9cd2dda1b78d0032b4eeac (patch) | |
| tree | 7c51bf3e8200ce50dcb661fe1f19b4180e3b2eb8 /src/com/android/launcher3/Folder.java | |
| parent | 62227274cb2c16c87beda01991c61618c800f66b (diff) | |
| parent | 82b016cb56540fe26213e817dd0dd668099c8e20 (diff) | |
| download | android_packages_apps_Trebuchet-485693c9eff4b10e7c9cd2dda1b78d0032b4eeac.tar.gz android_packages_apps_Trebuchet-485693c9eff4b10e7c9cd2dda1b78d0032b4eeac.tar.bz2 android_packages_apps_Trebuchet-485693c9eff4b10e7c9cd2dda1b78d0032b4eeac.zip | |
Merge "Trim all whitespace from titles and labels." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 3e203752a..6ca488853 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -309,13 +309,14 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mFolderName.setHint(sHintText); // Convert to a string here to ensure that no other state associated with the text field // gets saved. - String newTitle = mFolderName.getText().toString(); + CharSequence newTitle = mFolderName.getText(); mInfo.setTitle(newTitle); LauncherModel.updateItemInDatabase(mLauncher, mInfo); if (commit) { sendCustomAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED, - String.format(getContext().getString(R.string.folder_renamed), newTitle)); + String.format(getContext().getString(R.string.folder_renamed), + newTitle.toString())); } // In order to clear the focus from the text field, we set the focus on ourself. This // ensures that every time the field is clicked, focus is gained, giving reliable behavior. |