diff options
author | Winson Chung <winsonc@google.com> | 2015-04-07 21:04:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 21:04:25 +0000 |
commit | 1f0d5cb41f441fdb1656a71f581c3b38f1086288 (patch) | |
tree | 1c6d8e5250a5d9506b15f639a097736bdcb7c6de | |
parent | 50062408bfa63fda4485807aa6a4f93ed1e0eac8 (diff) | |
parent | 1c7c49331e22ba0bc1b54e72735364a946bf24e7 (diff) | |
download | android_packages_apps_Trebuchet-1f0d5cb41f441fdb1656a71f581c3b38f1086288.tar.gz android_packages_apps_Trebuchet-1f0d5cb41f441fdb1656a71f581c3b38f1086288.tar.bz2 android_packages_apps_Trebuchet-1f0d5cb41f441fdb1656a71f581c3b38f1086288.zip |
Merge "Fixing issue with building velvet against lower support lib." into ub-launcher3-burnaby
-rw-r--r-- | src/com/android/launcher3/AppsContainerRecyclerView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/AppsGridAdapter.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/AppsContainerRecyclerView.java b/src/com/android/launcher3/AppsContainerRecyclerView.java index 63e7fe4ac..c93bacf93 100644 --- a/src/com/android/launcher3/AppsContainerRecyclerView.java +++ b/src/com/android/launcher3/AppsContainerRecyclerView.java @@ -339,7 +339,7 @@ public class AppsContainerRecyclerView extends RecyclerView int childCount = getChildCount(); for (int i = 0; i < childCount; i++) { View child = getChildAt(i); - int position = getChildAdapterPosition(child); + int position = getChildPosition(child); if (position != NO_POSITION) { AlphabeticalAppsList.AdapterItem item = mApps.getAdapterItems().get(position); if (!item.isSectionHeader) { diff --git a/src/com/android/launcher3/AppsGridAdapter.java b/src/com/android/launcher3/AppsGridAdapter.java index 96d971669..5b6967c26 100644 --- a/src/com/android/launcher3/AppsGridAdapter.java +++ b/src/com/android/launcher3/AppsGridAdapter.java @@ -79,10 +79,10 @@ class AppsGridAdapter extends RecyclerView.Adapter<AppsGridAdapter.ViewHolder> { GridLayoutManager.LayoutParams lp = (GridLayoutManager.LayoutParams) child.getLayoutParams(); if (!holder.mIsSectionRow && !holder.mIsEmptyRow && !lp.isItemRemoved()) { - if (items.get(holder.getAdapterPosition() - 1).isSectionHeader) { + if (items.get(holder.getPosition() - 1).isSectionHeader) { // Draw at the parent AlphabeticalAppsList.AdapterItem item = - items.get(holder.getAdapterPosition()); + items.get(holder.getPosition()); String section = item.sectionName; mSectionTextPaint.getTextBounds(section, 0, section.length(), mTmpBounds); |