Improve margins for all tablets

My last patch caused the Remove and App Info icons to be cut off
and distorted. This change increases the space so that there is
no distortion on full sized or small tablets.
A problem remains that was present before. When you have the
searchbar invisible in landscape on a small tablet, the Remove
and App Info icons are not displayed. It works fine on large tablets,
on small tablets with the search bar visible and on small
tablets in portrait.

Change-Id: I61ae8d70785878026c1207f3677d667cc49d7c50

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();