diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-05-13 19:48:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 19:48:11 +0000 |
| commit | 358af81ca4a6495e20b2efe086dfafe844985cd3 (patch) | |
| tree | 4a8dba215ac1362ee10f251b1b2c0c6f32485a7a | |
| parent | 21e7311ea12ce842f4e3c79c497cafbdb4580a71 (diff) | |
| parent | fe7580aac4a75dfae5e59c52608182c5e9f76011 (diff) | |
| download | android_packages_apps_Trebuchet-358af81ca4a6495e20b2efe086dfafe844985cd3.tar.gz android_packages_apps_Trebuchet-358af81ca4a6495e20b2efe086dfafe844985cd3.tar.bz2 android_packages_apps_Trebuchet-358af81ca4a6495e20b2efe086dfafe844985cd3.zip | |
Merge "Set proper height of the widget tray container for preloading." into ub-launcher3-burnaby
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsContainerView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index f8d7d9256..00fb225ec 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(), |