diff options
author | Winson Chung <winsonc@google.com> | 2013-12-03 07:07:21 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-03 07:07:21 -0800 |
commit | ab84b8b4efa57e658c2c43f2876968b61cbe4005 (patch) | |
tree | 141469b092371020a1517ead2449e4b8f06a3cac | |
parent | 3ed4a4dd3dc77295579e8eaece294c30cf6831ef (diff) | |
parent | 1a5adf4f4cb30114fc0e508651b2833dd15674d0 (diff) | |
download | android_packages_apps_Trebuchet-ab84b8b4efa57e658c2c43f2876968b61cbe4005.tar.gz android_packages_apps_Trebuchet-ab84b8b4efa57e658c2c43f2876968b61cbe4005.tar.bz2 android_packages_apps_Trebuchet-ab84b8b4efa57e658c2c43f2876968b61cbe4005.zip |
am 1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)" into jb-ub-now-jolly-elf
* commit '1a5adf4f4cb30114fc0e508651b2833dd15674d0':
Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)
-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); |