summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/allapps
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-16 22:08:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-16 22:08:25 +0000
commita2341af20f7e61c83b9d7b047876cd11a0ae5c8e (patch)
tree00b5938ceb5ebb4a485bb08305305cdff76d74b4 /src/com/android/launcher3/allapps
parent301af8ebff4dd17c671936070394fac04a496024 (diff)
parent1a8f6fb736c36548a44db6c7018771e3a895dda0 (diff)
downloadandroid_packages_apps_Trebuchet-a2341af20f7e61c83b9d7b047876cd11a0ae5c8e.tar.gz
android_packages_apps_Trebuchet-a2341af20f7e61c83b9d7b047876cd11a0ae5c8e.tar.bz2
android_packages_apps_Trebuchet-a2341af20f7e61c83b9d7b047876cd11a0ae5c8e.zip
Merge "Updating the fast scroll bar UI" into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r--src/com/android/launcher3/allapps/AllAppsRecyclerView.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index b2a74ff15..0607a1e5d 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -376,7 +376,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
if (position == NO_POSITION) {
return -1;
}
- return getCurrentScrollY(position, getLayoutManager().getDecoratedTop(child));
+ return getPaddingTop() +
+ getCurrentScrollY(position, getLayoutManager().getDecoratedTop(child));
}
public int getCurrentScrollY(int position, int offset) {
@@ -406,8 +407,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
}
mCachedScrollPositions.put(position, y);
}
-
- return getPaddingTop() + y - offset;
+ return y - offset;
}
/**
@@ -416,7 +416,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
*/
@Override
protected int getAvailableScrollHeight() {
- return getCurrentScrollY(mApps.getAdapterItems().size(), 0)
+ return getPaddingTop() + getCurrentScrollY(mApps.getAdapterItems().size(), 0)
- getHeight() + getPaddingBottom();
}