diff options
| author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-13 01:21:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-13 01:21:28 +0000 |
| commit | 1f55bc4f0e5bf41dca49814176d061f7d09b300a (patch) | |
| tree | 9d4dcc93b0ab9cad72c28ceec483c86ea7d6cca6 | |
| parent | c4b39dbe53d258029a9d3f77d78121a0eca8ab4d (diff) | |
| parent | 25353dab744aa31a4b3d9b1a7d1c23c55cdf4601 (diff) | |
| download | android_packages_apps_Trebuchet-1f55bc4f0e5bf41dca49814176d061f7d09b300a.tar.gz android_packages_apps_Trebuchet-1f55bc4f0e5bf41dca49814176d061f7d09b300a.tar.bz2 android_packages_apps_Trebuchet-1f55bc4f0e5bf41dca49814176d061f7d09b300a.zip | |
Merge "Improve margins for all tablets" into cm-11.0
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 676f91b21..28951db94 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -241,7 +241,7 @@ public class DeviceProfile { searchBarVisible = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH, R.bool.preferences_interface_homescreen_search_default); searchBarSpaceWidthPx = Math.min(searchBarSpaceMaxWidthPx, widthPx); - searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ? searchBarHeightPx : 0); + searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ? searchBarHeightPx : 2 * edgeMarginPx); } void addCallback(DeviceProfileCallbacks cb) { @@ -651,7 +651,7 @@ public class DeviceProfile { // Update search bar for live settings searchBarVisible = SettingsProvider.getBoolean(launcher, SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH, R.bool.preferences_interface_homescreen_search_default); - searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ? searchBarHeightPx : 0); + searchBarSpaceHeightPx = 2 * edgeMarginPx + (searchBarVisible ? searchBarHeightPx : 2 * edgeMarginPx); FrameLayout.LayoutParams lp; Resources res = launcher.getResources(); boolean hasVerticalBarLayout = isVerticalBarLayout(); |