diff options
author | Kyle Ladd <laddkyle@msu.edu> | 2012-03-12 22:45:07 -0400 |
---|---|---|
committer | nebkat <nebkat@teamhacksung.org> | 2012-03-17 14:51:11 +0000 |
commit | 7f221ae496b3be70a50a475b01b1f342e6e7e7e5 (patch) | |
tree | b6e610f27c96ebd5214c138e5c931dfa4fd1a951 | |
parent | 3e7fdf1077d3c008080d9e4ecf03886325fe61d7 (diff) | |
download | android_packages_apps_Trebuchet-7f221ae496b3be70a50a475b01b1f342e6e7e7e5.tar.gz android_packages_apps_Trebuchet-7f221ae496b3be70a50a475b01b1f342e6e7e7e5.tar.bz2 android_packages_apps_Trebuchet-7f221ae496b3be70a50a475b01b1f342e6e7e7e5.zip |
Preferences: Show/hide homescreen icon labels
Change-Id: I4057152c571d73e4da2f1a43454feb152c0249af
-rw-r--r-- | res/values/strings.xml | 32 | ||||
-rw-r--r-- | res/xml/preferences.xml | 3 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Folder.java | 10 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/FolderIcon.java | 6 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 7 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java | 4 |
6 files changed, 44 insertions, 18 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 7d873a628..ee8a257af 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -45,7 +45,7 @@ <!-- AppsCustomize pane --> <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] --> <string name="long_press_widget_to_add">Touch & hold to pick up a widget.</string> - <!-- Market button text. The market button text is removed in Launcher.java + <!-- Market button text. The market button text is removed in Launcher.java in the Phone UI. [CHAR LIMIT=32] --> <string name="market">Shop</string> <!-- Menu button text. --> @@ -206,7 +206,7 @@ s --> shortcuts in Home.</string> <!-- Widgets: --> - <skip /> + <skip /> <!-- Text to show user in place of a gadget when we can't display it properly --> <string name="gadget_error_text">Problem loading widget</string> @@ -287,41 +287,43 @@ s --> <string name="preferences_interface_homescreen_general_category">General</string> <string name="preferences_interface_homescreen_general_screens_title">Homescreens</string> <string name="preferences_interface_homescreen_general_screens_summary">Number of screens on the homescreen</string> - <string name="preferences_interface_homescreen_general_default_screen_title">Default Screen</string> + <string name="preferences_interface_homescreen_general_default_screen_title">Default screen</string> <string name="preferences_interface_homescreen_general_default_screen_summary">Choose the default homescreen</string> - <string name="preferences_interface_homescreen_general_search_title">Search Bar</string> + <string name="preferences_interface_homescreen_general_search_title">Search bar</string> <string name="preferences_interface_homescreen_general_search_summary">Enable persistent search bar</string> <string name="preferences_interface_homescreen_general_resize_any_widget_title">Resize any widget</string> <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Allow resizing of widgets that normally aren\'t resizeable</string> + <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Hide icon labels</string> + <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Hide homescreen icon labels</string> <string name="preferences_interface_homescreen_scrolling_category">Scrolling</string> - <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Transition Effect</string> + <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Transition effect</string> <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Scrolling effect when scrolling homescreens</string> - <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Fade Side Pages</string> + <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Fade side pages</string> <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Fade the side pages when scrolling homescreens</string> - <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Scroll Wallpaper</string> + <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Scroll wallpaper</string> <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Scroll wallpaper when scrolling homescreens</string> <string name="preferences_interface_homescreen_indicator_category">Indicator</string> - <string name="preferences_interface_homescreen_indicator_enable_title">Show Page Indicator</string> + <string name="preferences_interface_homescreen_indicator_enable_title">Show page indicator</string> <string name="preferences_interface_homescreen_indicator_enable_summary">Show current page indicator at the bottom of the screen</string> - <string name="preferences_interface_homescreen_indicator_fade_title">Fade Indicator</string> + <string name="preferences_interface_homescreen_indicator_fade_title">Fade indicator</string> <string name="preferences_interface_homescreen_indicator_fade_summary">Fade the indicator after the homescreen has changed</string> - <string name="preferences_interface_homescreen_indicator_background_title">Show Dock Divider</string> + <string name="preferences_interface_homescreen_indicator_background_title">Show dock divider</string> <string name="preferences_interface_homescreen_indicator_background_summary">Show the background behind the indicator</string> <!-- Drawer --> <string name="preferences_interface_drawer_title">Drawer</string> <string name="preferences_interface_drawer_widgets_category">Widgets</string> - <string name="preferences_interface_drawer_widgets_join_apps_title">Join with Apps</string> + <string name="preferences_interface_drawer_widgets_join_apps_title">Join with apps</string> <string name="preferences_interface_drawer_widgets_join_apps_summary">Swipe from apps drawer to widgets drawer without changing tabs</string> <string name="preferences_interface_drawer_scrolling_category">Scrolling</string> - <string name="preferences_interface_drawer_scrolling_transition_effect_title">Transition Effect</string> + <string name="preferences_interface_drawer_scrolling_transition_effect_title">Transition effect</string> <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Scrolling effect when scrolling screens</string> - <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Fade Side Pages</string> + <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Fade side pages</string> <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Fade the side pages when scrolling screens</string> <string name="preferences_interface_drawer_indicator_category">Indicator</string> - <string name="preferences_interface_drawer_indicator_enable_title">Show Page Indicator</string> + <string name="preferences_interface_drawer_indicator_enable_title">Show page indicator</string> <string name="preferences_interface_drawer_indicator_enable_summary">Show current page indicator at the bottom of the screen</string> - <string name="preferences_interface_drawer_indicator_fade_title">Fade Indicator</string> + <string name="preferences_interface_drawer_indicator_fade_title">Fade indicator</string> <string name="preferences_interface_drawer_indicator_fade_summary">Fade the indicator after the page has changed</string> <!-- Dock --> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index ef3ee5c29..13d12a298 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -42,6 +42,9 @@ <CheckBoxPreference android:key="ui_homescreen_general_resize_any_widget" android:title="@string/preferences_interface_homescreen_general_resize_any_widget_title" android:summary="@string/preferences_interface_homescreen_general_resize_any_widget_summary" /> + <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels" + android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title" + android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" /> </PreferenceCategory> <PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category"> <ListPreference android:key="ui_homescreen_scrolling_transition_effect" diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java index 509bc96f8..57fcfcb69 100644 --- a/src/com/cyanogenmod/trebuchet/Folder.java +++ b/src/com/cyanogenmod/trebuchet/Folder.java @@ -47,6 +47,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.cyanogenmod.trebuchet.FolderInfo.FolderListener; +import com.cyanogenmod.trebuchet.preference.PreferencesProvider; import java.util.ArrayList; @@ -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() { @@ -250,7 +256,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 4042f4c88..cff6c9f9a 100644 --- a/src/com/cyanogenmod/trebuchet/FolderIcon.java +++ b/src/com/cyanogenmod/trebuchet/FolderIcon.java @@ -37,8 +37,10 @@ import android.view.animation.DecelerateInterpolator; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; + import com.cyanogenmod.trebuchet.DropTarget.DragObject; import com.cyanogenmod.trebuchet.FolderInfo.FolderListener; +import com.cyanogenmod.trebuchet.preference.PreferencesProvider; import java.util.ArrayList; @@ -112,7 +114,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 d079cd838..63e6c9085 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -260,6 +260,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() { @@ -298,6 +299,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.config_defaultAutoRotate)); if (PROFILE_STARTUP) { @@ -860,6 +862,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; } @@ -2952,7 +2957,7 @@ public final class Launcher extends Activity Dialog createDialog() { mAdapter = new AddAdapter(Launcher.this); - final AlertDialog.Builder builder = new AlertDialog.Builder(Launcher.this, + final AlertDialog.Builder builder = new AlertDialog.Builder(Launcher.this, AlertDialog.THEME_HOLO_DARK); builder.setAdapter(mAdapter, this); diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java index 4e9c03a83..13d146086 100644 --- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java +++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java @@ -45,6 +45,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); |