Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of 364742e712 to rvc-dev" into rvc-dev am: 00035a963f am: d727773b53 am: f7ff6d0851

Browse Source 
Change-Id: If0c536a4b1cd7b1b97758ecfc419fe383563d481
This commit is contained in:
Automerger Merge Worker
2020-03-06 17:17:15 +00:00
parent f2f3f09f4f f7ff6d0851
commit 286a27aaa3
1 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
View File

@@ -28,6 +28,9 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.annotation.Dimension; import android.annotation.Dimension;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.ActivityManager; import android.app.ActivityManager;
@@ -714,6 +717,8 @@ public class ScreenDecorations extends SystemUI implements Tunable {
public static class DisplayCutoutView extends View implements DisplayManager.DisplayListener, public static class DisplayCutoutView extends View implements DisplayManager.DisplayListener,
RegionInterceptableView { RegionInterceptableView {
private static final float HIDDEN_CAMERA_PROTECTION_SCALE = 0.5f;
private final DisplayInfo mInfo = new DisplayInfo(); private final DisplayInfo mInfo = new DisplayInfo();
private final Paint mPaint = new Paint(); private final Paint mPaint = new Paint();
private final List<Rect> mBounds = new ArrayList(); private final List<Rect> mBounds = new ArrayList();
@@ -732,6 +737,8 @@ public class ScreenDecorations extends SystemUI implements Tunable {
private int mRotation; private int mRotation;
private int mInitialPosition; private int mInitialPosition;
private int mPosition; private int mPosition;
private float mCameraProtectionProgress = HIDDEN_CAMERA_PROTECTION_SCALE;
private ValueAnimator mCameraProtectionAnimator;
public DisplayCutoutView(Context context, @BoundsPosition int pos, public DisplayCutoutView(Context context, @BoundsPosition int pos,
ScreenDecorations decorations) { ScreenDecorations decorations) {
@@ -770,17 +777,18 @@ public class ScreenDecorations extends SystemUI implements Tunable {
getLocationOnScreen(mLocation); getLocationOnScreen(mLocation);
canvas.translate(-mLocation[0], -mLocation[1]); canvas.translate(-mLocation[0], -mLocation[1]);
if (mShowProtection && !mProtectionRect.isEmpty()) { if (!mBoundingPath.isEmpty()) {
mPaint.setColor(mColor);
mPaint.setStyle(Paint.Style.FILL);
mPaint.setAntiAlias(true);
canvas.drawPath(mProtectionPath, mPaint);
} else if (!mBoundingPath.isEmpty()) {
mPaint.setColor(mColor); mPaint.setColor(mColor);
mPaint.setStyle(Paint.Style.FILL); mPaint.setStyle(Paint.Style.FILL);
mPaint.setAntiAlias(true); mPaint.setAntiAlias(true);
canvas.drawPath(mBoundingPath, mPaint); canvas.drawPath(mBoundingPath, mPaint);
} }
if (mCameraProtectionProgress > HIDDEN_CAMERA_PROTECTION_SCALE
&& !mProtectionRect.isEmpty()) {
canvas.scale(mCameraProtectionProgress, mCameraProtectionProgress,
mProtectionRect.centerX(), mProtectionRect.centerY());
canvas.drawPath(mProtectionPath, mPaint);
}
} }
@Override @Override
@@ -815,8 +823,31 @@ public class ScreenDecorations extends SystemUI implements Tunable {
mShowProtection = shouldShow; mShowProtection = shouldShow;
updateBoundingPath(); updateBoundingPath();
// Delay the relayout until the end of the animation when hiding the cutout,
// otherwise we'd clip it.
if (mShowProtection) {
requestLayout(); requestLayout();
}
if (mCameraProtectionAnimator != null) {
mCameraProtectionAnimator.cancel();
}
mCameraProtectionAnimator = ValueAnimator.ofFloat(mCameraProtectionProgress,
mShowProtection ? 1.0f : HIDDEN_CAMERA_PROTECTION_SCALE).setDuration(750);
mCameraProtectionAnimator.setInterpolator(Interpolators.DECELERATE_QUINT);
mCameraProtectionAnimator.addUpdateListener(animation -> {
mCameraProtectionProgress = (float) animation.getAnimatedValue();
invalidate(); invalidate();
});
mCameraProtectionAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mCameraProtectionAnimator = null;
if (!mShowProtection) {
requestLayout();
}
}
});
mCameraProtectionAnimator.start();
} }
private void update() { private void update() {