summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-01-16 08:03:28 +0000
committernebkat <nebkat@teamhacksung.org>2012-01-16 08:03:28 +0000
commita13e326a170f92101e8466cc4085f23ee9347d6d (patch)
treec4b87eb492733c11990d72aea20ca8bcacad5717 /src
parent831d9258083ec277cd3f7803ebca34a4b8cef4ff (diff)
downloadandroid_packages_apps_Trebuchet-a13e326a170f92101e8466cc4085f23ee9347d6d.tar.gz
android_packages_apps_Trebuchet-a13e326a170f92101e8466cc4085f23ee9347d6d.tar.bz2
android_packages_apps_Trebuchet-a13e326a170f92101e8466cc4085f23ee9347d6d.zip
Workspace: Fix bug
Change-Id: I9958d26c69df91d8e1fe67b7b54fb8206f240053
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 5f163f2d7..41630ce00 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -1778,7 +1778,7 @@ public class Workspace extends PagedView
float rotation = 0f;
float initialAlpha = cl.getAlpha();
float finalAlphaMultiplierValue = 1f;
- float finalAlpha = (mFadeInAdjacentScreens || stateIsSpringLoaded ||
+ float finalAlpha = (!mFadeInAdjacentScreens || stateIsSpringLoaded ||
(i == mCurrentPage)) ? 1f : 0f;
// Determine the pages alpha during the state transition
@@ -1867,7 +1867,7 @@ public class Workspace extends PagedView
// the current page is visible during (and subsequently, after) the transition
// animation. If fade adjacent pages is disabled, then re-enable the page
// visibility after the transition animation.
- if (mFadeInAdjacentScreens && stateIsNormal && oldStateIsSmall) {
+ if (!mFadeInAdjacentScreens && stateIsNormal && oldStateIsSmall) {
for (int i = 0; i < getChildCount(); i++) {
final CellLayout cl = (CellLayout) getChildAt(i);
cl.setAlpha(1f);