summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-08-12 16:32:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-12 16:32:08 -0700
commit01f6d474e1da3864570bb7f655019d6fa0c451e3 (patch)
treea157c73667197617328f9d36b9f2e8b28fc68a38 /src
parent1d4ee4e46218fb98a43cf584d8d4e3e569850f78 (diff)
parent1df26a368a135395b7bd61e9b109044b33b1b0be (diff)
downloadandroid_packages_apps_Trebuchet-01f6d474e1da3864570bb7f655019d6fa0c451e3.tar.gz
android_packages_apps_Trebuchet-01f6d474e1da3864570bb7f655019d6fa0c451e3.tar.bz2
android_packages_apps_Trebuchet-01f6d474e1da3864570bb7f655019d6fa0c451e3.zip
Merge "Fixing issue where folder names aren't being persisted"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Folder.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 15a0642e2..c490d5e6d 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -243,14 +243,14 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
public void doneEditingFolderName(boolean commit) {
mFolderName.setHint(sHintText);
+ // Convert to a string here to ensure that no other state associated with the text field
+ // gets saved.
+ mInfo.setTitle(mFolderName.getText().toString());
LauncherModel.updateItemInDatabase(mLauncher, mInfo);
mFolderName.setCursorVisible(false);
mFolderName.clearFocus();
Selection.setSelection((Spannable) mFolderName.getText(), 0, 0);
mIsEditingName = false;
- // Convert to a string here to ensure that no other state associated with the text field
- // gets saved.
- mInfo.setTitle(mFolderName.getText().toString());
}
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {