diff options
author | Winson Chung <winsonc@google.com> | 2013-12-02 22:49:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-02 22:49:28 +0000 |
commit | 1a5adf4f4cb30114fc0e508651b2833dd15674d0 (patch) | |
tree | 9d68dd1b5fd9932a988d58a2870e2d66687a7606 /src/com | |
parent | 10a8935ef1fc8f073e276fddc85bf66513050c81 (diff) | |
parent | 69e04ea5ab08ae923d5c8de079c7a36998e5e46a (diff) | |
download | android_packages_apps_Trebuchet-1a5adf4f4cb30114fc0e508651b2833dd15674d0.tar.gz android_packages_apps_Trebuchet-1a5adf4f4cb30114fc0e508651b2833dd15674d0.tar.bz2 android_packages_apps_Trebuchet-1a5adf4f4cb30114fc0e508651b2833dd15674d0.zip |
Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)" into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 626ec42cb..930188587 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -310,7 +310,7 @@ public class DeviceProfile { searchBarSpaceMaxWidthPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_max_width); searchBarHeightPx = resources.getDimensionPixelSize(R.dimen.dynamic_grid_search_bar_height); searchBarSpaceWidthPx = Math.min(searchBarSpaceMaxWidthPx, widthPx); - searchBarSpaceHeightPx = searchBarHeightPx + 2 * edgeMarginPx; + searchBarSpaceHeightPx = searchBarHeightPx + getSearchBarTopOffset(); // Calculate the actual text height Paint textPaint = new Paint(); @@ -419,6 +419,15 @@ public class DeviceProfile { return sum; } + /** Returns the search bar top offset */ + int getSearchBarTopOffset() { + if (isTablet() && !isVerticalBarLayout()) { + return 4 * edgeMarginPx; + } else { + return 2 * edgeMarginPx; + } + } + /** Returns the search bar bounds in the current orientation */ Rect getSearchBarBounds() { return getSearchBarBounds(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT); @@ -561,7 +570,7 @@ public class DeviceProfile { View searchBar = launcher.getSearchBar(); lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams(); if (hasVerticalBarLayout) { - // Vertical search bar + // Vertical search bar space lp.gravity = Gravity.TOP | Gravity.LEFT; lp.width = searchBarSpaceHeightPx; lp.height = LayoutParams.MATCH_PARENT; @@ -569,13 +578,13 @@ public class DeviceProfile { 0, 2 * edgeMarginPx, 0, 2 * edgeMarginPx); } else { - // Horizontal search bar + // Horizontal search bar space lp.gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL; lp.width = searchBarSpaceWidthPx; lp.height = searchBarSpaceHeightPx; searchBar.setPadding( 2 * edgeMarginPx, - 2 * edgeMarginPx, + getSearchBarTopOffset(), 2 * edgeMarginPx, 0); } searchBar.setLayoutParams(lp); |