openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge \"Add margin to all apps recycler container view b/29509347 > Last row inside recycler view was obstructed by nav bar making it difficult to interact with before.\" into ub-launcher3-calgary 

am: aac20dba11

Change-Id: Ice1b720217ed92046dc881382540dc289c207339
This commit is contained in:
Hyunyoung Song 2016-06-22 22:06:19 +00:00 committed by android-build-merger
parent 028e953ff9 aac20dba11
commit a1082b72af
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/launcher3/allapps/AllAppsContainerView.java
View File

@ -186,7 +186,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
mLayoutManager = mAdapter.getLayoutManager();
mItemDecoration = mAdapter.getItemDecoration();
DeviceProfile grid = mLauncher.getDeviceProfile();
if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && !grid.isLandscape) {
if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && !grid.isVerticalBarLayout()) {
mRecyclerViewTopBottomPadding = 0;
setPadding(0, 0, 0, 0);
} else {
@ -461,18 +461,19 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
DeviceProfile grid = mLauncher.getDeviceProfile();
if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
if (!grid.isLandscape) {
if (!grid.isVerticalBarLayout()) {
MarginLayoutParams mlp = (MarginLayoutParams) mAppsRecyclerView.getLayoutParams();
int navBarHeight = mLauncher.getDragLayer().getInsets().top;
int height = navBarHeight + grid.hotseatCellHeightPx;
Rect insets = mLauncher.getDragLayer().getInsets();
getContentView().setPadding(0,0,0, insets.bottom);
int height = insets.top + grid.hotseatCellHeightPx;
mlp.topMargin = height;
mAppsRecyclerView.setLayoutParams(mlp);
LinearLayout.LayoutParams llp =
(LinearLayout.LayoutParams) mSearchInput.getLayoutParams();
llp.topMargin = navBarHeight;
llp.topMargin = insets.top;
mSearchInput.setLayoutParams(llp);
lp.height = height;