diff options
author | Winson Chung <winsonc@google.com> | 2013-09-24 15:41:09 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-24 15:58:59 -0700 |
commit | abedd9fd4e692cd390f5c23d850206c9156e387a (patch) | |
tree | abc221472a28915fc7086373b8061a29b5e7a284 /src/com/android/launcher3/DynamicGrid.java | |
parent | 730c2e1f887b9a2226e2ce0aa508a9494a14e22f (diff) | |
download | android_packages_apps_Trebuchet-abedd9fd4e692cd390f5c23d850206c9156e387a.tar.gz android_packages_apps_Trebuchet-abedd9fd4e692cd390f5c23d850206c9156e387a.tar.bz2 android_packages_apps_Trebuchet-abedd9fd4e692cd390f5c23d850206c9156e387a.zip |
Extending the hit rect when testing for dragging over the hotseat.
Change-Id: I57cf863c663b1e57fa422db880b6003ead1199c8
Diffstat (limited to 'src/com/android/launcher3/DynamicGrid.java')
-rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index bbf0e03fd..495e930f9 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -290,8 +290,7 @@ class DeviceProfile { Rect getWorkspacePadding(int orientation) { Rect padding = new Rect(); - if (orientation == CellLayout.LANDSCAPE && - transposeLayoutWithOrientation) { + if (isVerticalBarLayout()) { // Pad the left and right of the workspace with search/hotseat bar sizes padding.set(searchBarSpaceHeightPx, edgeMarginPx, hotseatBarHeightPx, edgeMarginPx); @@ -321,6 +320,17 @@ class DeviceProfile { return padding; } + // The rect returned will be extended to below the system ui that covers the workspace + Rect getHotseatRect() { + if (isVerticalBarLayout()) { + return new Rect(availableWidthPx - hotseatBarHeightPx, 0, + Integer.MAX_VALUE, availableHeightPx); + } else { + return new Rect(0, availableHeightPx - hotseatBarHeightPx, + availableWidthPx, Integer.MAX_VALUE); + } + } + int calculateCellWidth(int width, int countX) { return width / countX; } @@ -338,11 +348,14 @@ class DeviceProfile { return isLargeTablet; } + boolean isVerticalBarLayout() { + return isLandscape && transposeLayoutWithOrientation; + } + public void layout(Launcher launcher) { FrameLayout.LayoutParams lp; Resources res = launcher.getResources(); - boolean hasVerticalBarLayout = isLandscape && - res.getBoolean(R.bool.hotseat_transpose_layout_with_orientation); + boolean hasVerticalBarLayout = isVerticalBarLayout(); // Layout the search bar space View searchBarSpace = launcher.findViewById(R.id.qsb_bar); |