mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-01 00:06:47 +00:00
Change AllApps padding to use a Rect
AllApps uses different values for left and right padding in some places (e.g. ActivityAllAppsContainerView uses workspacePadding.left/right), and this change is the first step into moving those values into DeviceProfile. Bug: 269632571 Test: NexusLauncherTest Flag: NONE Change-Id: I14c4edf55ca74f256b1aaa336fff246a0c78e25d
This commit is contained in:
@@ -797,7 +797,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
*/
|
||||
public int getFloatingSearchBarRestingMarginStart() {
|
||||
DeviceProfile dp = mActivityContext.getDeviceProfile();
|
||||
return dp.allAppsLeftRightMargin + dp.getAllAppsIconStartMargin();
|
||||
return dp.allAppsLeftRightMargin + dp.getAllAppsIconStartMargin(mActivityContext);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -810,7 +810,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
*/
|
||||
public int getFloatingSearchBarRestingMarginEnd() {
|
||||
DeviceProfile dp = mActivityContext.getDeviceProfile();
|
||||
return dp.allAppsLeftRightMargin + dp.getAllAppsIconStartMargin();
|
||||
return dp.allAppsLeftRightMargin + dp.getAllAppsIconStartMargin(mActivityContext);
|
||||
}
|
||||
|
||||
private void layoutBelowSearchContainer(View v, boolean includeTabsMargin) {
|
||||
@@ -1101,7 +1101,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
if (grid.isVerticalBarLayout()) {
|
||||
setPadding(grid.workspacePadding.left, 0, grid.workspacePadding.right, 0);
|
||||
} else {
|
||||
int topPadding = grid.allAppsTopPadding;
|
||||
int topPadding = grid.allAppsPadding.top;
|
||||
if (isSearchBarFloating() && !grid.isTablet) {
|
||||
topPadding += getResources().getDimensionPixelSize(
|
||||
R.dimen.all_apps_additional_top_padding_floating_search);
|
||||
@@ -1162,8 +1162,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
int bottomPadding = Math.max(mInsets.bottom, mNavBarScrimHeight);
|
||||
mAH.forEach(adapterHolder -> {
|
||||
adapterHolder.mPadding.bottom = bottomPadding;
|
||||
adapterHolder.mPadding.left =
|
||||
adapterHolder.mPadding.right = grid.allAppsLeftRightPadding;
|
||||
adapterHolder.mPadding.left = grid.allAppsPadding.left;
|
||||
adapterHolder.mPadding.right = grid.allAppsPadding.right;
|
||||
adapterHolder.applyPadding();
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user