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

Merge "Check null for actinosView in resetPaddingFromTaskSize" into sc-dev

Browse Source
This commit is contained in:
Alex Chau
2021-04-20 17:50:38 +00:00
committed by Android (Google) Code Review
parent 6f0dc99961 e485941c10
commit e8f147e2ce
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+19 -17
View File
@@ -1165,24 +1165,26 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
updateTaskSize(); updateTaskSize();
// Update ActionsView position // Update ActionsView position
FrameLayout.LayoutParams layoutParams = if (mActionsView != null) {
(FrameLayout.LayoutParams) mActionsView.getLayoutParams(); FrameLayout.LayoutParams layoutParams =
if (dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) { (FrameLayout.LayoutParams) mActionsView.getLayoutParams();
layoutParams.gravity = Gravity.BOTTOM; if (dp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()) {
layoutParams.bottomMargin = layoutParams.gravity = Gravity.BOTTOM;
dp.heightPx - mInsets.bottom - mLastComputedGridSize.bottom; layoutParams.bottomMargin =
layoutParams.leftMargin = mLastComputedTaskSize.left; dp.heightPx - mInsets.bottom - mLastComputedGridSize.bottom;
layoutParams.rightMargin = dp.widthPx - mLastComputedTaskSize.right; layoutParams.leftMargin = mLastComputedTaskSize.left;
// When in modal state, remove bottom margin to avoid covering content. layoutParams.rightMargin = dp.widthPx - mLastComputedTaskSize.right;
mActionsView.setModalTransformY(layoutParams.bottomMargin); // When in modal state, remove bottom margin to avoid covering content.
} else { mActionsView.setModalTransformY(layoutParams.bottomMargin);
layoutParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; } else {
layoutParams.bottomMargin = 0; layoutParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
layoutParams.leftMargin = 0; layoutParams.bottomMargin = 0;
layoutParams.rightMargin = 0; layoutParams.leftMargin = 0;
mActionsView.setModalTransformY(0); layoutParams.rightMargin = 0;
mActionsView.setModalTransformY(0);
}
mActionsView.setLayoutParams(layoutParams);
} }
mActionsView.setLayoutParams(layoutParams);
} }
/** /**