diff options
Diffstat (limited to 'src/com')
4 files changed, 22 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java index d10cb63..1e759e0 100644 --- a/src/com/cyanogenmod/trebuchet/Folder.java +++ b/src/com/cyanogenmod/trebuchet/Folder.java @@ -46,6 +46,7 @@ import android.widget.TextView; import com.cyanogenmod.trebuchet.R; import com.cyanogenmod.trebuchet.FolderInfo.FolderListener; +import com.cyanogenmod.trebuchet.preference.PreferencesProvider; import java.util.ArrayList; import java.util.Collections; @@ -172,6 +173,11 @@ 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() { @@ -254,7 +260,9 @@ 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(); - mInfo.setTitle(newTitle); + if (!PreferencesProvider.Interface.Homescreen.getHideIconLabels(mLauncher)) { + mInfo.setTitle(newTitle); + } LauncherModel.updateItemInDatabase(mLauncher, mInfo); if (commit) { diff --git a/src/com/cyanogenmod/trebuchet/FolderIcon.java b/src/com/cyanogenmod/trebuchet/FolderIcon.java index 5d2d5f2..e9c7104 100644 --- a/src/com/cyanogenmod/trebuchet/FolderIcon.java +++ b/src/com/cyanogenmod/trebuchet/FolderIcon.java @@ -39,9 +39,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.cyanogenmod.trebuchet.R; import com.cyanogenmod.trebuchet.DropTarget.DragObject; import com.cyanogenmod.trebuchet.FolderInfo.FolderListener; +import com.cyanogenmod.trebuchet.preference.PreferencesProvider; import java.util.ArrayList; @@ -133,7 +133,9 @@ public class FolderIcon extends LinearLayout implements FolderListener { FolderIcon icon = (FolderIcon) LayoutInflater.from(launcher).inflate(resId, group, false); icon.mFolderName = (BubbleTextView) icon.findViewById(R.id.folder_icon_name); - icon.mFolderName.setText(folderInfo.title); + if (!PreferencesProvider.Interface.Homescreen.getHideIconLabels(launcher)) { + icon.mFolderName.setText(folderInfo.title); + } icon.mPreviewBackground = (ImageView) icon.findViewById(R.id.preview_background); icon.setTag(folderInfo); diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index 15700bc..d65b60c 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -308,6 +308,7 @@ public final class Launcher extends Activity // Preferences private boolean mShowSearchBar; private boolean mShowDockDivider; + private boolean mHideIconLabels; private boolean mAutoRotate; private Runnable mBuildLayersRunnable = new Runnable() { @@ -381,6 +382,7 @@ public final class Launcher extends Activity // Preferences mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(this); mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(this); + mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(this); mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this, getResources().getBoolean(R.bool.allow_rotation)); if (PROFILE_STARTUP) { @@ -1017,6 +1019,9 @@ public final class Launcher extends Activity View createShortcut(int layoutResId, ViewGroup parent, ShortcutInfo info) { BubbleTextView favorite = (BubbleTextView) mInflater.inflate(layoutResId, parent, false); favorite.applyFromShortcutInfo(info, mIconCache); + if (mHideIconLabels){ + favorite.setText(null); + } favorite.setOnClickListener(this); return favorite; } diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java index 9551285..efdb74c 100644 --- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java +++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java @@ -59,6 +59,10 @@ public final class PreferencesProvider { final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); return preferences.getBoolean("ui_homescreen_general_resize_any_widget", false); } + public static boolean getHideIconLabels(Context context) { + final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); + return preferences.getBoolean("ui_homescreen_general_hide_icon_labels", false); + } public static class Scrolling { public static boolean getScrollWallpaper(Context context) { final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0); |