From fe7580aac4a75dfae5e59c52608182c5e9f76011 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Wed, 13 May 2015 12:00:23 -0700 Subject: [PATCH] Set proper height of the widget tray container for preloading. - previous height value was 0 before, now set it to proper height. However, getExtraLayoutSpace still worked because the super method set extra space (1 screen worth) only when ScrollState is non idle. Change-Id: Ifbaa6a105fe392735e106996d1f08276e678ebcb --- src/com/android/launcher3/widget/WidgetsContainerView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index f8d7d92564..00fb225ecd 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -33,6 +33,7 @@ import android.widget.Toast; import com.android.launcher3.BaseContainerView; import com.android.launcher3.CellLayout; import com.android.launcher3.DeleteDropTarget; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.DragController; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget.DragObject; @@ -122,8 +123,9 @@ public class WidgetsContainerView extends BaseContainerView mView.setLayoutManager(new LinearLayoutManager(getContext()) { @Override protected int getExtraLayoutSpace(State state) { + DeviceProfile grid = LauncherAppState.getInstance().getDynamicGrid().getDeviceProfile(); return super.getExtraLayoutSpace(state) - + WidgetsContainerView.this.getHeight() * PRELOAD_SCREEN_HEIGHT_MULTIPLE; + + grid.availableHeightPx * PRELOAD_SCREEN_HEIGHT_MULTIPLE; } }); mPadding.set(getPaddingLeft(), getPaddingTop(), getPaddingRight(),