summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxuke.yin <xuke.yin@ck-telecom.com>2015-05-22 17:08:02 +0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-05-27 21:39:13 +0000
commit13d6bcf08e004877bd268a88165d2bc265764366 (patch)
tree358d709008a61054a1bcd686143347f13e773934
parent990387c6c97395d1b6dd01c7ecaae5bff0d063ab (diff)
downloadandroid_packages_apps_Trebuchet-13d6bcf08e004877bd268a88165d2bc265764366.zip
android_packages_apps_Trebuchet-13d6bcf08e004877bd268a88165d2bc265764366.tar.gz
android_packages_apps_Trebuchet-13d6bcf08e004877bd268a88165d2bc265764366.tar.bz2
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
-rw-r--r--src/com/android/launcher3/Folder.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 76e3134..3182149 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