Loading res/values/strings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -142,7 +142,7 @@ <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string> <!-- Default folder title --> <string name="folder_hint_text">Tap to edit</string> <string name="folder_hint_text">Edit Name</string> <!-- Accessibility --> <!-- The format string for when an app is temporarily disabled. --> Loading src/com/android/launcher3/folder/Folder.java +4 −11 Original line number Diff line number Diff line Loading @@ -350,19 +350,12 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mFolderIcon.onTitleChanged(newTitle); mLauncher.getModelWriter().updateItemInDatabase(mInfo); if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) { mFolderName.setText(mInfo.title); // TODO: depending on whether the title was manually edited or automatically // suggested, apply different hint. mFolderName.setHint(""); } else { if (isEmpty(mInfo.title)) { if (TextUtils.isEmpty(mInfo.title)) { mFolderName.setHint(R.string.folder_hint_text); mFolderName.setText(""); } else { mFolderName.setHint(null); } } sendCustomAccessibilityEvent( this, AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED, Loading Loading
res/values/strings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -142,7 +142,7 @@ <string name="uninstall_system_app_text">This is a system app and can\'t be uninstalled.</string> <!-- Default folder title --> <string name="folder_hint_text">Tap to edit</string> <string name="folder_hint_text">Edit Name</string> <!-- Accessibility --> <!-- The format string for when an app is temporarily disabled. --> Loading
src/com/android/launcher3/folder/Folder.java +4 −11 Original line number Diff line number Diff line Loading @@ -350,19 +350,12 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mFolderIcon.onTitleChanged(newTitle); mLauncher.getModelWriter().updateItemInDatabase(mInfo); if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) { mFolderName.setText(mInfo.title); // TODO: depending on whether the title was manually edited or automatically // suggested, apply different hint. mFolderName.setHint(""); } else { if (isEmpty(mInfo.title)) { if (TextUtils.isEmpty(mInfo.title)) { mFolderName.setHint(R.string.folder_hint_text); mFolderName.setText(""); } else { mFolderName.setHint(null); } } sendCustomAccessibilityEvent( this, AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED, Loading