Fixing regression in screen pinning button visibility. (Bug 18390050) (86677c9a) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
		AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1f);
		PorterDuffColorFilter mDimColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.SRC_ATOP);
		Paint mDimLayerPaint = new Paint();
		float mActionButtonTranslationZ;

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

		@Override
		@@ -201,6 +203,12 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
		setDim(0);
		setLayerType(View.LAYER_TYPE_NONE, null);
		TaskViewTransform.reset(this);
		if (mActionButtonView != null) {
		mActionButtonView.setScaleX(1f);
		mActionButtonView.setScaleY(1f);
		mActionButtonView.setAlpha(1f);
		mActionButtonView.setTranslationZ(mActionButtonTranslationZ);
		}
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -8460,6 +8460,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		try {
		final TaskRecord task = mStackSupervisor.anyTaskForIdLocked(taskId);
		if (task == null) {
		Slog.d(TAG, "Could not find task for id: "+ taskId);
		return;
		}
		if (mStackSupervisor.isLockTaskModeViolation(task)) {