summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-06-12 14:54:41 -0700
committerAdam Cohen <adamcohen@google.com>2014-06-12 17:08:27 -0700
commit6f127a614c6a3e64a5de963f3a11d68d3368cd84 (patch)
tree4c1e9d2a96f36893e0ae98947348bef8bdc912b9 /src/com/android/launcher3/Workspace.java
parentc8d31ff228511d815aa8b46d5bd24c6cc8183333 (diff)
downloadandroid_packages_apps_Trebuchet-6f127a614c6a3e64a5de963f3a11d68d3368cd84.tar.gz
android_packages_apps_Trebuchet-6f127a614c6a3e64a5de963f3a11d68d3368cd84.tar.bz2
android_packages_apps_Trebuchet-6f127a614c6a3e64a5de963f3a11d68d3368cd84.zip
More defense for issue 14491953
Change-Id: I90de51c74e337d56aad891741233e6a857d89b62
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 001541825..bd9287fb2 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2086,13 +2086,17 @@ public class Workspace extends SmoothPagedView
}
@Override
- protected void getOverviewModePages(int[] range) {
+ protected void getFreeScrollPageRange(int[] range) {
+ getOverviewModePages(range);
+ }
+
+ private void getOverviewModePages(int[] range) {
int start = numCustomPages();
int end = getChildCount() - 1;
range[0] = Math.max(0, Math.min(start, getChildCount() - 1));
range[1] = Math.max(0, end);
- }
+ }
protected void onStartReordering() {
super.onStartReordering();