summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-10-20 14:56:06 (GMT)
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-10-20 14:56:06 (GMT)
commitfaa2c669daeb6bcd9948f356261c73170d006681 (patch)
tree49895858faf8716588fe055fcc7a0a1daf4aed5e
parentaf24e2dd527202bb4b7f8042e1b947a79d6668f0 (diff)
parentd410c53b3eaef7a5334a3f462b08afc18a9042c8 (diff)
downloadandroid_packages_apps_Trebuchet-faa2c669daeb6bcd9948f356261c73170d006681.zip
android_packages_apps_Trebuchet-faa2c669daeb6bcd9948f356261c73170d006681.tar.gz
android_packages_apps_Trebuchet-faa2c669daeb6bcd9948f356261c73170d006681.tar.bz2
Merge "Folder : Show folder name in exanded view w/ hide icon labels set" into ics
-rw-r--r--src/com/cyanogenmod/trebuchet/Folder.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index 57fcfcb..ec8eb79 100644
--- a/src/com/cyanogenmod/trebuchet/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -173,11 +173,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
mFolderName.setSelectAllOnFocus(true);
mFolderName.setInputType(mFolderName.getInputType() |
InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
-
- if (PreferencesProvider.Interface.Homescreen.getHideIconLabels(mLauncher)){
- mFolderName.setVisibility(View.GONE);
- mFolderNameHeight = getPaddingBottom();
- }
}
private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
@@ -256,9 +251,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
// Convert to a string here to ensure that no other state associated with the text field
// gets saved.
String newTitle = mFolderName.getText().toString();
- if (!PreferencesProvider.Interface.Homescreen.getHideIconLabels(mLauncher)) {
- mInfo.setTitle(newTitle);
- }
+ mInfo.setTitle(newTitle);
LauncherModel.updateItemInDatabase(mLauncher, mInfo);
if (commit) {