aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 10:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Hiding side pages during AllApps transition. (Bug 10971209)" into jb-ub-now-indigo-rose

Browse Source
This commit is contained in:
Winson Chung
2013-10-08 01:13:23 +00:00
committed by Android (Google) Code Review
parent 39511301a2 f4bd23662d
commit a3818ab906
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/launcher3/Workspace.java
View File

@@ -459,7 +459,8 @@ public class Workspace extends SmoothPagedView
protected boolean shouldDrawChild(View child) {
final CellLayout cl = (CellLayout) child;
return super.shouldDrawChild(child) &&
(cl.getShortcutsAndWidgets().getAlpha() > 0 ||
(mIsSwitchingState ||
cl.getShortcutsAndWidgets().getAlpha() > 0 ||
cl.getBackgroundAlpha() > 0);
}
@@ -1920,7 +1921,8 @@ public class Workspace extends SmoothPagedView
float finalSearchBarAlpha = !stateIsNormal ? 0f : 1f;
float finalWorkspaceTranslationY = stateIsOverview ? getOverviewModeTranslationY() : 0;
boolean zoomIn = true;
boolean workspaceToAllApps = (oldStateIsNormal && stateIsSmall);
boolean allAppsToWorkspace = (oldStateIsSmall && stateIsNormal);
mNewScale = 1.0f;
if (oldStateIsOverview) {
@@ -1937,19 +1939,32 @@ public class Workspace extends SmoothPagedView
} else if (stateIsSmall){
mNewScale = mOverviewModeShrinkFactor - 0.3f;
}
if (oldStateIsNormal && stateIsSmall) {
zoomIn = false;
if (workspaceToAllApps) {
updateChildrenLayersEnabled(false);
}
}
final int duration = zoomIn ?
final int duration = workspaceToAllApps ?
getResources().getInteger(R.integer.config_workspaceUnshrinkTime) :
getResources().getInteger(R.integer.config_appsCustomizeWorkspaceShrinkTime);
for (int i = 0; i < getChildCount(); i++) {
final CellLayout cl = (CellLayout) getChildAt(i);
float finalAlpha = (!mWorkspaceFadeInAdjacentScreens ||
(i == mCurrentPage)) && !stateIsSmall ? 1f : 0f;
boolean isCurrentPage = (i == mCurrentPage);
float initialAlpha = cl.getShortcutsAndWidgets().getAlpha();
float finalAlpha = stateIsSmall ? 0f : 1f;
// If we are animating to/from the small state, then hide the side pages and fade the
// current page in
if (!mIsSwitchingState) {
if (workspaceToAllApps || allAppsToWorkspace) {
if (allAppsToWorkspace && isCurrentPage) {
initialAlpha = 0f;
} else if (!isCurrentPage) {
initialAlpha = finalAlpha = 0f;
}
cl.setShortcutAndWidgetAlpha(initialAlpha);
}
}
mOldAlphas[i] = initialAlpha;
mNewAlphas[i] = finalAlpha;
@@ -2109,6 +2124,10 @@ public class Workspace extends SmoothPagedView
private void onTransitionPrepare() {
mIsSwitchingState = true;
// Invalidate here to ensure that the pages are rendered during the state change transition.
invalidate();
updateChildrenLayersEnabled(false);
hideCustomContentIfNecessary();
}