diff options
author | Flamefire <alex@grundis.de> | 2014-04-02 20:02:43 +0200 |
---|---|---|
committer | Flamefire <alex@grundis.de> | 2014-04-22 19:40:44 +0200 |
commit | 45936b33b0e03b1f3111a0bfaa61344cd10b2cd1 (patch) | |
tree | 55d20ae5f55397e9e28275a4e987774d1b18c4f4 /src/com/android/launcher3/Workspace.java | |
parent | 6a43e660cce2cda206f4fecf3ed4ecf9dce8f326 (diff) | |
download | android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.tar.gz android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.tar.bz2 android_packages_apps_Trebuchet-45936b33b0e03b1f3111a0bfaa61344cd10b2cd1.zip |
Add options to hide icon labels from drawer and homescreen
Forward port from CM 10.2
PS3: Fix typo
PS4: Rebase and global defaults
PS8: Rebase to head
Issue: There is already an Icon section in general, move both
settings there or leave separate in their categories?
Change-Id: I90ae4d2357e5f45fa9261c4eaa0fcf287996e327
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index c3ce8bf69..83074aeda 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -54,10 +54,7 @@ import android.view.Display; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.View.OnClickListener; -import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.AccessibilityNodeInfo; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.TextView; @@ -282,6 +279,7 @@ public class Workspace extends SmoothPagedView private boolean mShowSearchBar; private boolean mShowOutlines; + private boolean mHideIconLabels; /** * Used to inflate the Workspace from XML. @@ -315,6 +313,9 @@ public class Workspace extends SmoothPagedView mShowOutlines = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES, R.bool.preferences_interface_homescreen_scrolling_page_outlines_default); + mHideIconLabels = SettingsProvider.getBoolean(context, + SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, + R.bool.preferences_interface_homescreen_hide_icon_labels); mWorkspaceFadeInAdjacentScreens = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT, R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default); @@ -895,7 +896,9 @@ public class Workspace extends SmoothPagedView } else { // Show folder title if not in the hotseat if (child instanceof FolderIcon) { - ((FolderIcon) child).setTextVisible(true); + ((FolderIcon) child).setTextVisible(!mHideIconLabels); + } else if (child instanceof BubbleTextView) { + ((BubbleTextView) child).setTextVisibility(!mHideIconLabels); } layout = getScreenWithId(screenId); child.setOnKeyListener(new IconKeyEventListener()); @@ -3707,6 +3710,7 @@ public class Workspace extends SmoothPagedView case LauncherSettings.Favorites.ITEM_TYPE_FOLDER: view = FolderIcon.fromXml(R.layout.folder_icon, mLauncher, cellLayout, (FolderInfo) info, mIconCache); + ((FolderIcon) view).setTextVisible(!mHideIconLabels); break; default: throw new IllegalStateException("Unknown item type: " + info.itemType); |