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?

Conflicts:
	res/values/preferences_defaults.xml
	res/xml/preferences_drawer.xml
	res/xml/preferences_homescreen.xml
	src/com/android/launcher3/AppsCustomizePagedView.java
	src/com/android/launcher3/Folder.java
	src/com/android/launcher3/Launcher.java
	src/com/android/launcher3/PagedViewIcon.java
	src/com/android/launcher3/Workspace.java

Change-Id: I90ae4d2357e5f45fa9261c4eaa0fcf287996e327

1 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 13ee53f57..53e8040ba 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -307,6 +307,7 @@ public class Workspace extends SmoothPagedView
     private boolean mShowSearchBar;
     private boolean mShowOutlines;
     private boolean mHideIconLabels;
+
     /**
      * Used to inflate the Workspace from XML.
      *
@@ -342,6 +343,12 @@ public class Workspace extends SmoothPagedView
         mScrollWallpaper = SettingsProvider.getBoolean(context,
                 SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
                 R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
+        mHideIconLabels = SettingsProvider.getBoolean(context,
+                SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
+                R.bool.preferences_interface_homescreen_hide_icon_labels_default);
+        mWorkspaceFadeInAdjacentScreens = SettingsProvider.getBoolean(context,
+                SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_FADE_ADJACENT,
+                R.bool.preferences_interface_homescreen_scrolling_fade_adjacent_default);
         TransitionEffect.setFromString(this, SettingsProvider.getString(context,
                 SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_TRANSITION_EFFECT,
                 R.string.preferences_interface_homescreen_scrolling_transition_effect));
@@ -1057,7 +1064,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());
@@ -4063,6 +4072,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);