Trebuchet: Don't resize BubbleTextView based on all apps pref

Issue-id: CYNGNOS-1427

Change-Id: I3bb5107fa24b85e5713d7f6403a332246609804b

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 44edfcb..ba6c89c 100644 (file)
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -93,8 +93,6 @@
     <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
-    <dimen name="all_apps_icon_size_grid">55dp</dimen>
-    <dimen name="all_apps_icon_size_ragged">48dp</dimen>
 
 <!-- Widget tray -->
     <dimen name="widget_container_inset">8dp</dimen>

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 32b3a02..b957c47 100644 (file)
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -132,16 +132,6 @@ public class BubbleTextView extends TextView
             setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx);
             defaultIconSize = grid.allAppsIconSizePx;
         }
-        boolean useCompactDrawer = SettingsProvider.getBoolean(context,
-                SettingsProvider.SETTINGS_UI_DRAWER_STYLE_USE_COMPACT,
-                R.bool.preferences_interface_drawer_compact_default);
-        boolean useLargeIcons = SettingsProvider.getBoolean(context,
-                SettingsProvider.SETTINGS_UI_GENERAL_ICONS_LARGE,
-                R.bool.preferences_interface_general_icons_large_default);
-        if (!useLargeIcons && !useCompactDrawer) {
-            defaultIconSize = getResources()
-                    .getDimensionPixelSize(R.dimen.all_apps_icon_size_ragged);
-        }
 
         mIconSize = a.getDimensionPixelSize(R.styleable.BubbleTextView_iconSizeOverride,
                 defaultIconSize);