diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-19 11:12:14 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-19 11:12:14 -0800 |
| commit | f94068462649986dad263f28226be6c514af47d3 (patch) | |
| tree | 7f9622b0e83c4f4fd2ebd40134140d5f1aac44a2 /src/com/android/launcher3/widget | |
| parent | b347535cb09c5a7bebf0c928d9842236e43cd4b5 (diff) | |
| parent | a6194d3d9205488d6f5400193f8d4d6aaf140218 (diff) | |
| download | android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.tar.gz android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.tar.bz2 android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.zip | |
resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary
Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277
Diffstat (limited to 'src/com/android/launcher3/widget')
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsContainerView.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index 9a0c50bac..a87c932bc 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -64,7 +64,7 @@ public class WidgetsContainerView extends BaseContainerView private IconCache mIconCache; /* Recycler view related member variables */ - private WidgetsRecyclerView mView; + private WidgetsRecyclerView mRecyclerView; private WidgetsListAdapter mAdapter; /* Touch handling related member variables. */ @@ -73,8 +73,6 @@ public class WidgetsContainerView extends BaseContainerView /* Rendering related. */ private WidgetPreviewLoader mWidgetPreviewLoader; - private Rect mPadding = new Rect(); - public WidgetsContainerView(Context context) { this(context, null); } @@ -97,11 +95,11 @@ public class WidgetsContainerView extends BaseContainerView @Override protected void onFinishInflate() { super.onFinishInflate(); - mView = (WidgetsRecyclerView) getContentView(); - mView.setAdapter(mAdapter); + mRecyclerView = (WidgetsRecyclerView) getContentView().findViewById(R.id.widgets_list_view); + mRecyclerView.setAdapter(mAdapter); // This extends the layout space so that preloading happen for the {@link RecyclerView} - mView.setLayoutManager(new LinearLayoutManager(getContext()) { + mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()) { @Override protected int getExtraLayoutSpace(State state) { DeviceProfile grid = mLauncher.getDeviceProfile(); @@ -109,8 +107,6 @@ public class WidgetsContainerView extends BaseContainerView + grid.availableHeightPx * PRELOAD_SCREEN_HEIGHT_MULTIPLE; } }); - mPadding.set(getPaddingLeft(), getPaddingTop(), getPaddingRight(), - getPaddingBottom()); } // @@ -118,7 +114,7 @@ public class WidgetsContainerView extends BaseContainerView // public void scrollToTop() { - mView.scrollToPosition(0); + mRecyclerView.scrollToPosition(0); } // @@ -330,14 +326,14 @@ public class WidgetsContainerView extends BaseContainerView // @Override protected void onUpdateBgPadding(Rect padding, Rect bgPadding) { - mView.updateBackgroundPadding(bgPadding); + mRecyclerView.updateBackgroundPadding(bgPadding); } /** * Initialize the widget data model. */ public void addWidgets(WidgetsModel model) { - mView.setWidgets(model); + mRecyclerView.setWidgets(model); mAdapter.setWidgetsModel(model); mAdapter.notifyDataSetChanged(); } |