diff options
author | cretin45 <cretin45@gmail.com> | 2015-12-22 15:08:21 -0800 |
---|---|---|
committer | Tom Powell <zifnab@zifnab06.net> | 2017-03-26 16:13:55 -0700 |
commit | 7fa3faa3bf0594a4cf7273430df78a2ac8024838 (patch) | |
tree | 1ea648ba6d275db24ec1e18cfadf7eeb6955d230 | |
parent | dbc5e0166c67cb6d31e1c7ae07b3e6305d10d295 (diff) | |
download | android_packages_apps_Trebuchet-7fa3faa3bf0594a4cf7273430df78a2ac8024838.tar.gz android_packages_apps_Trebuchet-7fa3faa3bf0594a4cf7273430df78a2ac8024838.tar.bz2 android_packages_apps_Trebuchet-7fa3faa3bf0594a4cf7273430df78a2ac8024838.zip |
Trebuchet: Don't resize BubbleTextView based on all apps pref
Issue-id: CYNGNOS-1427
Change-Id: I3bb5107fa24b85e5713d7f6403a332246609804b
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 44edfcb6e..ba6c89ce9 100644 --- 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 32b3a0217..b957c47be 100644 --- 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); |