diff options
author | Adam Cohen <adamcohen@google.com> | 2011-06-21 22:39:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-21 22:39:21 -0700 |
commit | 2a451abcc0d81d249840ca755d54ae829002d27e (patch) | |
tree | 78c80a1dd2f78dfa8c7bde2f5caae40891453b3b /src | |
parent | 6a888d2419afb57eb7b073df51c6d9a84b0fd7d7 (diff) | |
parent | 4ef610fc88e447ff6d6cdd382a7d064be9f739d6 (diff) | |
download | android_packages_apps_Trebuchet-2a451abcc0d81d249840ca755d54ae829002d27e.tar.gz android_packages_apps_Trebuchet-2a451abcc0d81d249840ca755d54ae829002d27e.tar.bz2 android_packages_apps_Trebuchet-2a451abcc0d81d249840ca755d54ae829002d27e.zip |
Merge "Adding select all on focus to folder renaming, changed spacing"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 960fa551c..90d20900c 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -99,6 +99,8 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL private Alarm mOnExitAlarm = new Alarm(); private TextView mFolderName; private int mFolderNameHeight; + private static String sDefaultFolderName; + private Rect mHitRect = new Rect(); private boolean mIsEditingName = false; private InputMethodManager mInputMethodManager; @@ -122,6 +124,10 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL Resources res = getResources(); mExpandDuration = res.getInteger(R.integer.config_folderAnimDuration); + + if (sDefaultFolderName == null) { + sDefaultFolderName = res.getString(R.string.folder_name); + } } @Override @@ -142,6 +148,7 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL mFolderName.setCustomSelectionActionModeCallback(mActionModeCallback); mFolderName.setCursorVisible(false); mFolderName.setOnEditorActionListener(this); + mFolderName.setSelectAllOnFocus(true); } private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() { @@ -183,7 +190,6 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL } } - private Rect mHitRect = new Rect(); public boolean onInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { mFolderName.getHitRect(mHitRect); @@ -322,7 +328,12 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL } mItemsInvalidated = true; mInfo.addListener(this); - mFolderName.setText(mInfo.title); + + if (sDefaultFolderName != mInfo.title) { + mFolderName.setText(mInfo.title); + } else { + mFolderName.setText(""); + } } /** |