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

Fixing regression in L3 with search bar transition.

Browse Source 
Change-Id: Ia4155a653012c5d23df21167233fe766e5479347
This commit is contained in:
Winson
2015-09-25 16:12:35 -07:00
committed by Winson Chung
parent 17e2d49547
commit f768d93468
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Launcher.java
View File

@@ -3571,8 +3571,12 @@ public class Launcher extends Activity
// NO-OP
}
public boolean launcherCallbacksProvidesSearch() {
return (mLauncherCallbacks != null && mLauncherCallbacks.providesSearch());
}
public View getOrCreateQsbBar() {
if (mLauncherCallbacks != null && mLauncherCallbacks.providesSearch()) {
if (launcherCallbacksProvidesSearch()) {
return mLauncherCallbacks.getQsbBar();
}

39
src/com/android/launcher3/LauncherStateTransitionAnimation.java
View File

@@ -710,26 +710,27 @@ public class LauncherStateTransitionAnimation {
toWorkspaceState.getSearchDropTargetBarState();
if (overlaySearchBar != null) {
if ((toWorkspaceState == Workspace.State.NORMAL) &&
(fromWorkspaceState == Workspace.State.NORMAL_HIDDEN)) {
// If we are transitioning from the overlay to the workspace, then show the
// workspace search bar immediately and let the overlay search bar fade out on top
mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, 0);
} else if (fromWorkspaceState == Workspace.State.NORMAL) {
// If we are transitioning from the workspace to the overlay, then keep the
// workspace search bar visible until the overlay search bar fades in on top
animation.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, 0);
}
});
} else {
// Otherwise, then just animate the workspace search bar normally
mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, duration);
if (mLauncher.launcherCallbacksProvidesSearch()) {
if ((toWorkspaceState == Workspace.State.NORMAL) &&
(fromWorkspaceState == Workspace.State.NORMAL_HIDDEN)) {
// If we are transitioning from the overlay to the workspace, then show the
// workspace search bar immediately and let the overlay search bar fade out on
// top
mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, 0);
return;
} else if (fromWorkspaceState == Workspace.State.NORMAL) {
// If we are transitioning from the workspace to the overlay, then keep the
// workspace search bar visible until the overlay search bar fades in on top
animation.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, 0);
}
});
return;
}
}
} else {
// If there is no overlay search bar, then just animate the workspace search bar
// Fallback to the default search bar animation otherwise
mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, duration);
}
}