summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxuke.yin <xuke.yin@ck-telecom.com>2015-05-22 09:08:02 (GMT)
committerStephen Bird <sbird@cyngn.com>2015-05-27 21:39:50 (GMT)
commit7025ea24402546e4d40facc519dc2d3d8a5f4cf1 (patch)
tree9220a449e434381a2cda8135d3e602af20f9cd3f
parentc42bdf92b00da631b0ed0d345ea6c280838629ae (diff)
downloadandroid_packages_apps_Trebuchet-7025ea24402546e4d40facc519dc2d3d8a5f4cf1.zip
android_packages_apps_Trebuchet-7025ea24402546e4d40facc519dc2d3d8a5f4cf1.tar.gz
android_packages_apps_Trebuchet-7025ea24402546e4d40facc519dc2d3d8a5f4cf1.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 (cherry picked from commit 13d6bcf08e004877bd268a88165d2bc265764366) (cherry picked from commit 347c6ec103f0f7781012a8ddac282bfbd319437d)
-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 e4f935c..6c1296b 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