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

Commit 2a8fef96 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 31b8ed21: am c23d37aa: am 31dc5801: Only show FAB for the frontmost task 

* commit '31b8ed21c78344587be114669a91095fbd838fa7':
  Only show FAB for the frontmost task
parents 4d64addc 40f6384b

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.graphics.Rect; 
import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewTreeObserver;

import android.view.accessibility.AccessibilityEvent;

import android.widget.FrameLayout;

import com.android.systemui.R;
@@ -810,6 +809,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
            TaskView frontTv = getChildViewForTask(newFrontMostTask);

            if (frontTv != null) {

                frontTv.onTaskBound(newFrontMostTask);

                frontTv.fadeInActionButton(false);

            }

        }

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+31 −14
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ import android.animation.ObjectAnimator; 
import android.animation.ValueAnimator;

import android.content.Context;

import android.graphics.*;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.util.AttributeSet;

import android.view.View;

import android.view.ViewOutlineProvider;

import android.view.ViewPropertyAnimator;

import android.view.animation.AccelerateInterpolator;

import android.widget.FrameLayout;

import com.android.systemui.R;
@@ -34,6 +33,7 @@ import com.android.systemui.recents.Constants; 
import com.android.systemui.recents.RecentsConfiguration;

import com.android.systemui.recents.model.RecentsTaskLoader;

import com.android.systemui.recents.model.Task;

import com.android.systemui.statusbar.phone.PhoneStatusBar;



/* A task view */

public class TaskView extends FrameLayout implements Task.TaskCallbacks,
@@ -265,8 +265,6 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 


        } else if (mConfig.launchedFromAppWithThumbnail) {

            if (isTaskViewLaunchTargetTask) {

                // Hide the action button if it exists

                mActionButtonView.setAlpha(0f);

                // Set the dim to 0 so we can animate it in

                initialDim = 0;

            } else if (occludesLaunchTarget) {
@@ -383,14 +381,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 


                // Animate the footer into view

                animateFooterVisibility(true, mConfig.taskBarEnterAnimDuration);

                fadeInActionButton(true);





                // Animate the action button in

                mActionButtonView.animate().alpha(1f)

                        .setStartDelay(mConfig.taskBarEnterAnimDelay)

                        .setDuration(mConfig.taskBarEnterAnimDuration)

                        .setInterpolator(mConfig.fastOutLinearInInterpolator)

                        .withLayer()

                        .start();

            } else {

                // Animate the task up if it was occluding the launch target

                if (ctx.currentTaskOccludesLaunchTarget) {
@@ -463,6 +456,23 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
        }, (startDelay / 2));

    }



    public void fadeInActionButton(boolean withDelay) {

        // Hide the action button

        mActionButtonView.setAlpha(0f);



        // Animate the action button in

        ViewPropertyAnimator animator = mActionButtonView.animate().alpha(1f)

                .setDuration(mConfig.taskBarEnterAnimDuration)

                .setInterpolator(PhoneStatusBar.ALPHA_IN)

                .withLayer();

        if (withDelay) {

            animator.setStartDelay(mConfig.taskBarEnterAnimDelay);

        }

        animator.start();





    }



    /** Animates this task view as it leaves recents by pressing home. */

    void startExitToHomeAnimation(ViewAnimation.TaskViewExitContext ctx) {

        animate()
@@ -783,9 +793,16 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
        } else {

            animateFooterVisibility(t.lockToThisTask, mConfig.taskViewLockToAppLongAnimDuration);

        }

        // Hide the action button if lock to app is disabled

        if (!t.lockToTaskEnabled && mActionButtonView.getVisibility() != View.GONE) {

            mActionButtonView.setVisibility(View.GONE);

        updateLockButtonVisibility(t);



    }



    private void updateLockButtonVisibility(Task t) {

        // Hide the action button if lock to app is disabled for this view

        int lockButtonVisibility = (!t.lockToTaskEnabled || !t.lockToThisTask) ? GONE : VISIBLE;

        if (mActionButtonView.getVisibility() != lockButtonVisibility) {

            mActionButtonView.setVisibility(lockButtonVisibility);

            requestLayout();

        }

    }