diff options
author | Flamefire <alex@grundis.de> | 2014-11-10 10:35:01 -0800 |
---|---|---|
committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:58 -0800 |
commit | 6c336aea9f6f895fedb29840eb3598989317f8bc (patch) | |
tree | 8261baaef46a1b6f4a4a8c7dad87d668f3d5912b /src/com/android/launcher3/AppsCustomizePagedView.java | |
parent | ec033982ef151a1e226ce452f64518879bd5a696 (diff) | |
download | android_packages_apps_Trebuchet-6c336aea9f6f895fedb29840eb3598989317f8bc.tar.gz android_packages_apps_Trebuchet-6c336aea9f6f895fedb29840eb3598989317f8bc.tar.bz2 android_packages_apps_Trebuchet-6c336aea9f6f895fedb29840eb3598989317f8bc.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?
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
Diffstat (limited to 'src/com/android/launcher3/AppsCustomizePagedView.java')
-rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 61ae2894d..55b4a557b 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -1032,11 +1032,15 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen layout.removeAllViewsOnPage(); ArrayList<Object> items = new ArrayList<Object>(); ArrayList<Bitmap> images = new ArrayList<Bitmap>(); + boolean hideIconLabels = SettingsProvider.getBoolean(mLauncher, + SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS, + R.bool.preferences_interface_drawer_hide_icon_labels_default); for (int i = startIndex; i < endIndex; ++i) { AppInfo info = mApps.get(i); BubbleTextView icon = (BubbleTextView) mLayoutInflater.inflate( R.layout.apps_customize_application, layout, false); icon.applyFromApplicationInfo(info); + icon.setTextVisibility(!hideIconLabels); icon.setOnClickListener(mLauncher); icon.setOnLongClickListener(this); icon.setOnTouchListener(this); |