diff options
| author | Tony Wickham <twickham@google.com> | 2018-06-14 16:27:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-14 16:27:18 +0000 |
| commit | a32b6a1d3794a1849f00d54735dcad24bfd84491 (patch) | |
| tree | 68b551e1f35a2866a94187e26b7b536cfaaec518 /quickstep | |
| parent | 9d2a75f741059bdcdb23f2674d60e1c7b49c1286 (diff) | |
| parent | 1eeffbee0128cac1bc64c948008bb28788c06c0f (diff) | |
| download | android_packages_apps_Trebuchet-a32b6a1d3794a1849f00d54735dcad24bfd84491.tar.gz android_packages_apps_Trebuchet-a32b6a1d3794a1849f00d54735dcad24bfd84491.tar.bz2 android_packages_apps_Trebuchet-a32b6a1d3794a1849f00d54735dcad24bfd84491.zip | |
Merge "Add padding between hotseat and insets in multiwindow landscape" into ub-launcher3-edmonton-polish
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/quickstep/ActivityControlHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java index 3197532b4..275075f27 100644 --- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java +++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java @@ -185,7 +185,7 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { if (dp.isVerticalBarLayout()) { Rect targetInsets = dp.getInsets(); int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right; - return dp.hotseatBarSizePx + dp.hotseatBarSidePaddingPx + hotseatInset; + return dp.hotseatBarSizePx + hotseatInset; } else { int shelfHeight = dp.hotseatBarSizePx + dp.getInsets().bottom; // Track slightly below the top of the shelf (between top and content). @@ -448,7 +448,7 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { if (dp.isVerticalBarLayout()) { Rect targetInsets = dp.getInsets(); int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right; - return dp.hotseatBarSizePx + dp.hotseatBarSidePaddingPx + hotseatInset; + return dp.hotseatBarSizePx + hotseatInset; } else { return dp.heightPx - outRect.rect.bottom; } |