summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-08 01:25:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-08 01:25:45 +0000
commitd9ecec11667aa5d26b04b16f9b37eb6ed01c22c3 (patch)
treed384fdf1e97e7aa1ffe88e2e55955eb54f13a39d /src/com/android/launcher3/Workspace.java
parenta3818ab906de7c82bd25bb41c18e40558c2cf2b4 (diff)
parent296ab0fde68c6aeb255c96a31440fa7f844e02a2 (diff)
downloadandroid_packages_apps_Trebuchet-d9ecec11667aa5d26b04b16f9b37eb6ed01c22c3.tar.gz
android_packages_apps_Trebuchet-d9ecec11667aa5d26b04b16f9b37eb6ed01c22c3.tar.bz2
android_packages_apps_Trebuchet-d9ecec11667aa5d26b04b16f9b37eb6ed01c22c3.zip
Merge "Fixing flash when you swipe a page and go into All Apps (Bug 10971209)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index c69fa7b70..b9552eaaa 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1949,7 +1949,7 @@ public class Workspace extends SmoothPagedView
getResources().getInteger(R.integer.config_appsCustomizeWorkspaceShrinkTime);
for (int i = 0; i < getChildCount(); i++) {
final CellLayout cl = (CellLayout) getChildAt(i);
- boolean isCurrentPage = (i == mCurrentPage);
+ boolean isCurrentPage = (i == getNextPage());
float initialAlpha = cl.getShortcutsAndWidgets().getAlpha();
float finalAlpha = stateIsSmall ? 0f : 1f;