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

Commit 46695cf9 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

am 1c903b4e: Merge "Fixing regression in screen pinning button visibility.... 

am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev
automerge: 0d539c29

* commit '0d539c29':
  Fixing regression in screen pinning button visibility. (Bug 18390050)
parents f1faf930 0d539c29

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)) {