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

Commit 1c903b4e authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev

parents 553aeed9 86677c9a

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
    AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1f);

    AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1f);

    PorterDuffColorFilter mDimColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.SRC_ATOP);

    PorterDuffColorFilter mDimColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.SRC_ATOP);

    Paint mDimLayerPaint = new Paint();

    Paint mDimLayerPaint = new Paint();

    float mActionButtonTranslationZ;





    Task mTask;

    Task mTask;

    boolean mTaskDataLoaded;

    boolean mTaskDataLoaded;
@@ -145,6 +146,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
                outline.setOval(0, 0, mActionButtonView.getWidth(), mActionButtonView.getHeight());

                outline.setOval(0, 0, mActionButtonView.getWidth(), mActionButtonView.getHeight());

            }

            }

        });

        });

        mActionButtonTranslationZ = mActionButtonView.getTranslationZ();

    }

    }





    @Override

    @Override
@@ -201,6 +203,12 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
        setDim(0);

        setDim(0);

        setLayerType(View.LAYER_TYPE_NONE, null);

        setLayerType(View.LAYER_TYPE_NONE, null);

        TaskViewTransform.reset(this);

        TaskViewTransform.reset(this);

        if (mActionButtonView != null) {

            mActionButtonView.setScaleX(1f);

            mActionButtonView.setScaleY(1f);

            mActionButtonView.setAlpha(1f);

            mActionButtonView.setTranslationZ(mActionButtonTranslationZ);

        }

    }

    }





    /**

    /**

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -8460,6 +8460,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        try {

        try {

            final TaskRecord task = mStackSupervisor.anyTaskForIdLocked(taskId);

            final TaskRecord task = mStackSupervisor.anyTaskForIdLocked(taskId);

            if (task == null) {

            if (task == null) {

                Slog.d(TAG, "Could not find task for id: "+ taskId);

                return;

                return;

            }

            }

            if (mStackSupervisor.isLockTaskModeViolation(task)) {

            if (mStackSupervisor.isLockTaskModeViolation(task)) {