PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

am 0b38a944: am b6186d2b: am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf

Browse Source 
* commit '0b38a9447a6e146132922ab18862b96534f3e968':
  Fix issue where custom content would be invisible (issue 11644432)
This commit is contained in:
Adam Cohen
2014-02-14 20:53:52 +00:00
committed by Android Git Automerger
parent 905157ef4d 0b38a9447a
commit 0765fc4d8b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+8 -1
View File
@@ -2110,7 +2110,8 @@ public class Workspace extends SmoothPagedView
if (stateIsSmall) { if (stateIsSmall) {
finalAlpha = 0f; finalAlpha = 0f;
} else if (stateIsNormal && mWorkspaceFadeInAdjacentScreens) { } else if (stateIsNormal && mWorkspaceFadeInAdjacentScreens) {
finalAlpha = i == getNextPage() ? 1f : 0f;
finalAlpha = (i == getNextPage() || i < numCustomPages()) ? 1f : 0f;
} else { } else {
finalAlpha = 1f; finalAlpha = 1f;
} }
@@ -2351,6 +2352,11 @@ public class Workspace extends SmoothPagedView
final CellLayout cl = (CellLayout) getChildAt(i); final CellLayout cl = (CellLayout) getChildAt(i);
cl.setShortcutAndWidgetAlpha(1f); cl.setShortcutAndWidgetAlpha(1f);
} }
} else {
for (int i = 0; i < numCustomPages(); i++) {
final CellLayout cl = (CellLayout) getChildAt(i);
cl.setShortcutAndWidgetAlpha(1f);
}
} }
showCustomContentIfNecessary(); showCustomContentIfNecessary();
} }
@@ -4568,6 +4574,7 @@ public class Workspace extends SmoothPagedView
child.requestFocus(); child.requestFocus();
} }
} }
exitWidgetResizeMode();
} }
@Override @Override