Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2dc7c35 authored by Winson's avatar Winson
Browse files

Fixing regression in search bar animation. 

- The other case should fall through to the animation even 
  when there is no search bar overlay.

Change-Id: Id91bea78b56934cc1c3379777068adc100f11dba
parent 5fbe0746

src/com/android/launcher3/LauncherStateTransitionAnimation.java

+5 −5
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ public class LauncherStateTransitionAnimation { 
            if (overlaySearchBarView != null) {

                overlaySearchBarView.setAlpha(0f);

                ObjectAnimator searchBarAlpha = ObjectAnimator.ofFloat(overlaySearchBarView, "alpha", 0f, 1f);

                searchBarAlpha.setDuration(100);

                searchBarAlpha.setDuration(revealDuration / 2);

                searchBarAlpha.setInterpolator(new AccelerateInterpolator(1.5f));

                layerViews.put(overlaySearchBarView, BUILD_AND_SET_LAYER);

                animation.play(searchBarAlpha);
@@ -593,8 +593,8 @@ public class LauncherStateTransitionAnimation { 
                if (overlaySearchBarView != null) {

                    overlaySearchBarView.setAlpha(1f);

                    ObjectAnimator searchAlpha = ObjectAnimator.ofFloat(overlaySearchBarView, "alpha", 1f, 0f);

                    searchAlpha.setDuration(material ? 100 : 150);

                    searchAlpha.setInterpolator(decelerateInterpolator);

                    searchAlpha.setDuration(revealDuration / 2);

                    searchAlpha.setInterpolator(new AccelerateInterpolator(1.5f));

                    searchAlpha.setStartDelay(material ? 0 : itemsAlphaStagger + SINGLE_FRAME_DELAY);

                    layerViews.put(overlaySearchBarView, BUILD_AND_SET_LAYER);

                    animation.play(searchAlpha);
@@ -730,10 +730,10 @@ public class LauncherStateTransitionAnimation { 
                    return;

                }

            }

        }

        // Fallback to the default search bar animation otherwise

        mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, duration);

    }

    }



    /**

     * Dispatches the prepare-transition event to suitable views.