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

Merge "Adding some assets / fixing a couple bugs" into jb-ub-now-indigo-rose

Browse Source
This commit is contained in:
Adam Cohen
2013-09-19 19:01:37 +00:00
committed by Android (Google) Code Review
parent b94f3f804f 3f452c87db
commit 437dec39ee
14 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1950,7 +1950,8 @@ public class Workspace extends SmoothPagedView
AlphaUpdateListener.updateVisibility(getPageIndicator());
}
searchBar.setAlpha(finalSearchBarAlpha);
AlphaUpdateListener.updateVisibility(mLauncher.getSearchBar());
AlphaUpdateListener.updateVisibility(searchBar);
updateCustomContentVisibility();
}
if (finalSearchBarAlpha == 0) {
mLauncher.setVoiceButtonProxyVisible(false);
@@ -2017,10 +2018,27 @@ public class Workspace extends SmoothPagedView
private void onTransitionPrepare() {
mIsSwitchingState = true;
updateChildrenLayersEnabled(false);
if (mState != Workspace.State.NORMAL) {
if (hasCustomContent()) {
mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
}
hideCustomContentIfNecessary();
}
void updateCustomContentVisibility() {
int visibility = mState == Workspace.State.NORMAL ? VISIBLE : INVISIBLE;
if (hasCustomContent()) {
mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(visibility);
}
}
void showCustomContentIfNecessary() {
boolean show = mState == Workspace.State.NORMAL;
if (show && hasCustomContent()) {
mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE);
}
}
void hideCustomContentIfNecessary() {
boolean hide = mState != Workspace.State.NORMAL;
if (hide && hasCustomContent()) {
mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(INVISIBLE);
}
}
@@ -2037,11 +2055,7 @@ public class Workspace extends SmoothPagedView
cl.setShortcutAndWidgetAlpha(1f);
}
}
if (mState == Workspace.State.NORMAL) {
if (hasCustomContent()) {
mWorkspaceScreens.get(CUSTOM_CONTENT_SCREEN_ID).setVisibility(VISIBLE);
}
}
showCustomContentIfNecessary();
}
@Override