commit 136c17631d8bfe51caa614252abb2049393aa139
author Chris Wren <cwren@android.com> Wed Oct 02 17:12:12 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 02 17:12:13 2013 +0000
tree 5d11d59a6cae58faf7380277f7eafc6dc4e43ada
parent 40d6264a8e1a29b0f11a03fff39db1dc7f967088
parent 22e130d40148c28cd4b9ab0c25f1d846da76bce7

Merge "backup launcher icons" into jb-ub-now-indigo-rose

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a9cb771..f1d4c1d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1720,7 +1720,7 @@
         }
     }
     protected void showWorkspaceAndExitOverviewMode() {
-        showWorkspaceAndExitOverviewMode(true);
+        showWorkspaceAndExitOverviewMode(false);
     }
 
     @Override

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 6d75018..fcc1aff 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1051,7 +1051,7 @@
 
     protected void getOverviewModePages(int[] range) {
         range[0] = 0;
-        range[1] = getChildCount() - 1;
+        range[1] = Math.max(0, getChildCount() - 1);
     }
 
     protected void getVisiblePages(int[] range) {
@@ -1476,7 +1476,7 @@
     }
 
     public int getScrollForPage(int index) {
-        if (mPageScrolls == null || index >= mPageScrolls.length) {
+        if (mPageScrolls == null || index >= mPageScrolls.length || index < 0) {
             return 0;
         } else {
             return mPageScrolls[index];