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

Commit 5454fa1f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Making caret visibility part of state definition" into ub-launcher3-edmonton

parents 36b2fca3 56e1019e

quickstep/src/com/android/launcher3/uioverrides/OverviewState.java

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ public class OverviewState extends LauncherState { 
    @Override

    public int getVisibleElements(Launcher launcher) {

        if (launcher.getDeviceProfile().isVerticalBarLayout()) {

            return 0;

            return VERTICAL_SWIPE_INDICATOR;

        } else {

            return HOTSEAT_SEARCH_BOX |

            return HOTSEAT_SEARCH_BOX | VERTICAL_SWIPE_INDICATOR |

                    (launcher.getAppsView().getFloatingHeaderView().hasVisibleContent()

                            ? ALL_APPS_HEADER_EXTRA : HOTSEAT_ICONS);

        }

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+10 −1
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ import android.view.ViewDebug; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.views.ScrimView;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.LayoutUtils;
@@ -136,6 +139,12 @@ public class LauncherRecentsView extends RecentsView<Launcher> { 
        }

        anim.play(ObjectAnimator.ofFloat(

                mActivity.getAllAppsController(), ALL_APPS_PROGRESS, allAppsProgressOffscreen));



        ObjectAnimator dragHandleAnim = ObjectAnimator.ofInt(

                mActivity.findViewById(R.id.scrim_view), ScrimView.DRAG_HANDLE_ALPHA, 0);

        dragHandleAnim.setInterpolator(Interpolators.ACCEL_2);

        anim.play(dragHandleAnim);



        return anim;

    }
@@ -150,7 +159,7 @@ public class LauncherRecentsView extends RecentsView<Launcher> { 
            mActivity.getStateManager().goToState(NORMAL, false /* animate */);

        } else {

            LauncherState state = mActivity.getStateManager().getState();

            mActivity.getAllAppsController().setProgress(state.getVerticalProgress(mActivity));

            mActivity.getAllAppsController().setState(state);

        }

        super.onTaskLaunched(success);

    }

quickstep/src/com/android/quickstep/views/ShelfScrimView.java

+0 −9
Original line number Diff line number Diff line
@@ -153,15 +153,6 @@ public class ShelfScrimView extends ScrimView { 
        }

    }



    @Override

    protected void updateDragHandleAlpha() {

        if (mDrawingFlatColor) {

            super.updateDragHandleAlpha();

        } else if (mDragHandle != null) {

            mDragHandle.setAlpha(255);

        }

    }



    @Override

    protected void onDraw(Canvas canvas) {

        float translate = drawBackground(canvas);

src/com/android/launcher3/LauncherState.java

+3 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ public class LauncherState { 
    public static final int ALL_APPS_HEADER = 1 << 2;

    public static final int ALL_APPS_HEADER_EXTRA = 1 << 3; // e.g. app predictions

    public static final int ALL_APPS_CONTENT = 1 << 4;

    public static final int VERTICAL_SWIPE_INDICATOR = 1 << 5;



    protected static final int FLAG_MULTI_PAGE = 1 << 0;

    protected static final int FLAG_DISABLE_ACCESSIBILITY = 1 << 1;
@@ -201,9 +202,9 @@ public class LauncherState { 


    public int getVisibleElements(Launcher launcher) {

        if (launcher.getDeviceProfile().isVerticalBarLayout()) {

            return HOTSEAT_ICONS;

            return HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR;

        }

        return HOTSEAT_ICONS | HOTSEAT_SEARCH_BOX;

        return HOTSEAT_ICONS | HOTSEAT_SEARCH_BOX | VERTICAL_SWIPE_INDICATOR;

    }



    /**

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT; 
import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;

import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.LauncherState.VERTICAL_SWIPE_INDICATOR;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;

import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
@@ -198,6 +199,9 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil 
        setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, LINEAR);

        setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, LINEAR);

        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter);



        setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,

                (visibleElements & VERTICAL_SWIPE_INDICATOR) != 0 ? 255 : 0, LINEAR);

    }



    public AnimatorListenerAdapter getProgressAnimatorListener() {