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

Commit 006ee269 authored by Winson Chung's avatar Winson Chung Committed by Winson
Browse files

Refactoring search bar animations. 

- This refactoring ensures that LauncherStateTransition does not
  do its own animation on the QSB, and that all animations to the
  SearchDropTargetBar go through its own animators.

Bug: 22515084

Change-Id: Ia7d13c44d861eac7517076b52a9651a90911ed0a
parent 153b02a5

src/com/android/launcher3/DeviceProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.Paint.FontMetrics; 
import android.graphics.Point;

import android.graphics.Rect;

import android.util.DisplayMetrics;

import android.util.Size;

import android.view.Gravity;

import android.view.View;

import android.view.ViewGroup;
@@ -385,7 +384,7 @@ public class DeviceProfile { 
        final boolean isLayoutRtl = Utilities.isRtl(launcher.getResources());



        // Layout the search bar space

        View searchBar = launcher.getSearchBar();

        View searchBar = launcher.getSearchDropTargetBar();

        lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();

        if (hasVerticalBarLayout) {

            // Vertical search bar space -- The search bar is fixed in the layout to be on the left

src/com/android/launcher3/DragLayer.java

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class DragLayer extends InsettableFrameLayout { 
    }



    private boolean isEventOverDropTargetBar(MotionEvent ev) {

        getDescendantRectRelativeToSelf(mLauncher.getSearchBar(), mHitRect);

        getDescendantRectRelativeToSelf(mLauncher.getSearchDropTargetBar(), mHitRect);

        if (mHitRect.contains((int) ev.getX(), (int) ev.getY())) {

            return true;

        }
@@ -321,7 +321,7 @@ public class DragLayer extends InsettableFrameLayout { 
            childrenForAccessibility.add(currentFolder);



            if (isInAccessibleDrag()) {

                childrenForAccessibility.add(mLauncher.getSearchBar());

                childrenForAccessibility.add(mLauncher.getSearchDropTargetBar());

            }

        } else {

            super.addChildrenForAccessibility(childrenForAccessibility);

src/com/android/launcher3/Folder.java

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 


    @Override

    public void enableAccessibleDrag(boolean enable) {

        mLauncher.getSearchBar().enableAccessibleDrag(enable);

        mLauncher.getSearchDropTargetBar().enableAccessibleDrag(enable);

        for (int i = 0; i < mContent.getChildCount(); i++) {

            mContent.getPageAt(i).enableAccessibleDrag(enable, CellLayout.FOLDER_ACCESSIBILITY_DRAG);

        }

src/com/android/launcher3/Launcher.java

+18 −30
Original line number Diff line number Diff line
@@ -132,8 +132,7 @@ import java.util.concurrent.atomic.AtomicInteger; 
 */

public class Launcher extends Activity

        implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks,

                   View.OnTouchListener, PageSwitchListener, LauncherProviderChangeListener,

                   LauncherStateTransitionAnimation.Callbacks {

                   View.OnTouchListener, PageSwitchListener, LauncherProviderChangeListener {

    static final String TAG = "Launcher";

    static final boolean LOGD = false;
@@ -452,7 +451,7 @@ public class Launcher extends Activity 


        mDragController = new DragController(this);

        mInflater = getLayoutInflater();

        mStateTransitionAnimation = new LauncherStateTransitionAnimation(this, this);

        mStateTransitionAnimation = new LauncherStateTransitionAnimation(this);



        mStats = new Stats(this);
@@ -1844,7 +1843,7 @@ public class Launcher extends Activity 
        return mOverviewPanel;

    }



    public SearchDropTargetBar getSearchBar() {

    public SearchDropTargetBar getSearchDropTargetBar() {

        return mSearchDropTargetBar;

    }
@@ -3265,14 +3264,6 @@ public class Launcher extends Activity 
        }

    }



    @Override

    public void onStateTransitionHideSearchBar() {

        // Hide the search bar

        if (mSearchDropTargetBar != null) {

            mSearchDropTargetBar.hideSearchBar(false /* animated */);

        }

    }



    public void showWorkspace(boolean animated) {

        showWorkspace(WorkspaceStateTransitionAnimation.SCROLL_TO_CURRENT_PAGE, animated, null);

    }
@@ -3290,16 +3281,9 @@ public class Launcher extends Activity 
        boolean changed = mState != State.WORKSPACE ||

                mWorkspace.getState() != Workspace.State.NORMAL;

        if (changed) {

            boolean wasInSpringLoadedMode = (mState != State.WORKSPACE);

            mWorkspace.setVisibility(View.VISIBLE);

            mStateTransitionAnimation.startAnimationToWorkspace(mState, Workspace.State.NORMAL,

                    snapToPage, animated, onCompleteRunnable);



            // Show the search bar (only animate if we were showing the drop target bar in spring

            // loaded mode)

            if (mSearchDropTargetBar != null) {

                mSearchDropTargetBar.showSearchBar(animated && wasInSpringLoadedMode);

            }

            mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),

                    Workspace.State.NORMAL, snapToPage, animated, onCompleteRunnable);



            // Set focus to the AppsCustomize button

            if (mAllAppsButton != null) {
@@ -3323,7 +3307,8 @@ public class Launcher extends Activity 


    void showOverviewMode(boolean animated) {

        mWorkspace.setVisibility(View.VISIBLE);

        mStateTransitionAnimation.startAnimationToWorkspace(mState, Workspace.State.OVERVIEW,

        mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),

                Workspace.State.OVERVIEW,

                WorkspaceStateTransitionAnimation.SCROLL_TO_CURRENT_PAGE, animated,

                null /* onCompleteRunnable */);

        mState = State.WORKSPACE;
@@ -3378,9 +3363,10 @@ public class Launcher extends Activity 
        }



        if (toState == State.APPS) {

            mStateTransitionAnimation.startAnimationToAllApps(animated, focusSearchBar);

            mStateTransitionAnimation.startAnimationToAllApps(mWorkspace.getState(), animated,

                    focusSearchBar);

        } else {

            mStateTransitionAnimation.startAnimationToWidgets(animated);

            mStateTransitionAnimation.startAnimationToWidgets(mWorkspace.getState(), animated);

        }



        // Change the state *after* we've called all the transition code
@@ -3402,10 +3388,9 @@ public class Launcher extends Activity 
     * new state.

     */

    public Animator startWorkspaceStateChangeAnimation(Workspace.State toState, int toPage,

            boolean animated, boolean hasOverlaySearchBar, HashMap<View, Integer> layerViews) {

            boolean animated, HashMap<View, Integer> layerViews) {

        Workspace.State fromState = mWorkspace.getState();

        Animator anim = mWorkspace.setStateWithAnimation(toState, toPage, animated,

                hasOverlaySearchBar, layerViews);

        Animator anim = mWorkspace.setStateWithAnimation(toState, toPage, animated, layerViews);

        updateInteraction(fromState, toState);

        return anim;

    }
@@ -3417,7 +3402,8 @@ public class Launcher extends Activity 
            return;

        }



        mStateTransitionAnimation.startAnimationToWorkspace(mState, Workspace.State.SPRING_LOADED,

        mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),

                Workspace.State.SPRING_LOADED,

                WorkspaceStateTransitionAnimation.SCROLL_TO_CURRENT_PAGE, true /* animated */,

                null /* onCompleteRunnable */);

        mState = isAppsViewVisible() ? State.APPS_SPRING_LOADED : State.WIDGETS_SPRING_LOADED;
@@ -4517,14 +4503,16 @@ public class Launcher extends Activity 
        if (mWorkspace != null) mWorkspace.setAlpha(1f);

        if (mHotseat != null) mHotseat.setAlpha(1f);

        if (mPageIndicators != null) mPageIndicators.setAlpha(1f);

        if (mSearchDropTargetBar != null) mSearchDropTargetBar.showSearchBar(false);

        if (mSearchDropTargetBar != null) mSearchDropTargetBar.animateToState(

                SearchDropTargetBar.State.SEARCH_BAR, 0);

    }



    void hideWorkspaceSearchAndHotseat() {

        if (mWorkspace != null) mWorkspace.setAlpha(0f);

        if (mHotseat != null) mHotseat.setAlpha(0f);

        if (mPageIndicators != null) mPageIndicators.setAlpha(0f);

        if (mSearchDropTargetBar != null) mSearchDropTargetBar.hideSearchBar(false);

        if (mSearchDropTargetBar != null) mSearchDropTargetBar.animateToState(

                SearchDropTargetBar.State.INVISIBLE, 0);

    }



    // TODO: These method should be a part of LauncherSearchCallback

src/com/android/launcher3/LauncherStateTransitionAnimation.java

+125 −89

File changed.

Preview size limit exceeded, changes collapsed.