diff options
| author | xuke.yin <xuke.yin@ck-telecom.com> | 2015-05-22 17:08:02 +0800 |
|---|---|---|
| committer | Stephen Bird <sbird@cyngn.com> | 2015-05-27 21:40:13 +0000 |
| commit | 288ca2e698c935bfb3024341ca9709eaa8435877 (patch) | |
| tree | 6b40cd5ec5c4b6ca507b1111e096d5d784f3c046 | |
| parent | e5a68947f1e7deea293136929fbfe5c1b8e2ad86 (diff) | |
| download | android_packages_apps_Trebuchet-288ca2e698c935bfb3024341ca9709eaa8435877.tar.gz android_packages_apps_Trebuchet-288ca2e698c935bfb3024341ca9709eaa8435877.tar.bz2 android_packages_apps_Trebuchet-288ca2e698c935bfb3024341ca9709eaa8435877.zip | |
Fix the hint text of rename folder can't change with system language
Reproduce
1)In workspace make a folder, click the folder check the hint text of
the rename edittext.
2)Change the system language, then click the folder for rename, in the
second time click the folder the hint text will change to the last
language.
Change-Id: I97d14a15bfa748be900bef193950b85b890efe40
(cherry picked from commit 13d6bcf08e004877bd268a88165d2bc265764366)
(cherry picked from commit 347c6ec103f0f7781012a8ddac282bfbd319437d)
(cherry picked from commit 7025ea24402546e4d40facc519dc2d3d8a5f4cf1)
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index e4f935cf3..6c1296b34 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -185,9 +185,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (sDefaultFolderName == null) { sDefaultFolderName = res.getString(R.string.folder_name); } - if (sHintText == null) { - sHintText = res.getString(R.string.folder_hint_text); - } + sHintText = res.getString(R.string.folder_hint_text); mLauncher = (Launcher) context; // We need this view to be focusable in touch mode so that when text editing of the folder // name is complete, we have something to focus on, thus hiding the cursor and giving |