summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxuke.yin <xuke.yin@ck-telecom.com>2015-05-22 17:08:02 +0800
committerniks255 <niks255@mail.ru>2017-01-07 04:40:59 +0600
commit877614ce90533ae4b267e3a78c50368b07fef2f4 (patch)
tree550870067515f6bd80267c87670f52b53726e322
parenta44212d8d225f4ea15e72764a2615f93b1053416 (diff)
downloadandroid_packages_apps_Trebuchet-877614ce90533ae4b267e3a78c50368b07fef2f4.tar.gz
android_packages_apps_Trebuchet-877614ce90533ae4b267e3a78c50368b07fef2f4.tar.bz2
android_packages_apps_Trebuchet-877614ce90533ae4b267e3a78c50368b07fef2f4.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
-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 8bc38c544..880025b78 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -181,9 +181,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