PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-08780e110858405ea39dc68192daceab"

Browse Source 
* changes:
  [automerge] Aligning Hotseat and Workspace icons in vertical bar mode 2p: 38bb3b0c5c 2p: 677d9c5aac
  [automerge] Aligning Hotseat and Workspace icons in vertical bar mode 2p: 38bb3b0c5c
  Aligning Hotseat and Workspace icons in vertical bar mode
This commit is contained in:
TreeHugger Robot
2022-03-24 09:23:50 +00:00
committed by Android (Google) Code Review
parent 90ec2826de 00663101b6
commit a2ed76b57b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DeviceProfile.java
+11 -2
View File
@@ -982,8 +982,17 @@ public class DeviceProfile {
*/
public Rect getHotseatLayoutPadding(Context context) {
if (isVerticalBarLayout()) {
int paddingTop = Math.max(mInsets.top - cellLayoutPaddingPx.top, 0);
int paddingBottom = Math.max(mInsets.bottom - cellLayoutPaddingPx.bottom, 0);
// The hotseat icons will be placed in the middle of the hotseat cells.
// Changing the hotseatCellHeightPx is not affecting hotseat icon positions
// in vertical bar layout.
// Workspace icons are moved up by a small factor. The variable diffOverlapFactor
// is set to account for that difference.
float diffOverlapFactor = iconSizePx * (ICON_OVERLAP_FACTOR - 1) / 2;
int paddingTop = Math.max((int) (mInsets.top + cellLayoutPaddingPx.top
- diffOverlapFactor), 0);
int paddingBottom = Math.max((int) (mInsets.bottom + cellLayoutPaddingPx.bottom
+ diffOverlapFactor), 0);
if (isSeascape()) {
mHotseatPadding.set(mInsets.left + hotseatBarSidePaddingStartPx, paddingTop,
hotseatBarSidePaddingEndPx, paddingBottom);