summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxuke.yin <xuke.yin@ck-telecom.com>2015-05-22 17:08:02 +0800
committerStephen Bird <sbird@cyngn.com>2015-05-27 21:39:21 +0000
commit347c6ec103f0f7781012a8ddac282bfbd319437d (patch)
tree65c9e6c545abb4061fee2e2e5b992759e8c41b15
parent16416d464bfad477d9fc3e1805154f2014954081 (diff)
downloadandroid_packages_apps_Trebuchet-347c6ec103f0f7781012a8ddac282bfbd319437d.tar.gz
android_packages_apps_Trebuchet-347c6ec103f0f7781012a8ddac282bfbd319437d.tar.bz2
android_packages_apps_Trebuchet-347c6ec103f0f7781012a8ddac282bfbd319437d.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)
-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 7254a639f..070eb3722 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -195,9 +195,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