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

Merge "Rounded corner not align to right on land" into tm-dev

Browse Source
This commit is contained in:
Milton Wu
2022-04-28 00:10:27 +00:00
committed by Android (Google) Code Review
parent 1fc50caf0e 094a611901
commit d159f7211c
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt
View File

@@ -380,7 +380,7 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec
) { ) {
if (hasTopRoundedCorner == hasTop && if (hasTopRoundedCorner == hasTop &&
hasBottomRoundedCorner == hasBottom && hasBottomRoundedCorner == hasBottom &&
roundedCornerBottomSize == bottomSize && roundedCornerTopSize == topSize &&
roundedCornerBottomSize == bottomSize) { roundedCornerBottomSize == bottomSize) {
return return
} }

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

@@ -348,7 +348,8 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab
@Override @Override
public void onDisplayChanged(int displayId) { public void onDisplayChanged(int displayId) {
final int newRotation = mContext.getDisplay().getRotation(); final int newRotation = mContext.getDisplay().getRotation();
if (mOverlays != null && mRotation != newRotation) { if ((mOverlays != null || mScreenDecorHwcWindow != null)
&& mRotation != newRotation) {
// We cannot immediately update the orientation. Otherwise // We cannot immediately update the orientation. Otherwise
// WindowManager is still deferring layout until it has finished dispatching // WindowManager is still deferring layout until it has finished dispatching
// the config changes, which may cause divergence between what we draw // the config changes, which may cause divergence between what we draw
@@ -362,11 +363,13 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab
+ mRotation); + mRotation);
} }
for (int i = 0; i < BOUNDS_POSITION_LENGTH; i++) { if (mOverlays != null) {
if (mOverlays[i] != null) { for (int i = 0; i < BOUNDS_POSITION_LENGTH; i++) {
final ViewGroup overlayView = mOverlays[i].getRootView(); if (mOverlays[i] != null) {
overlayView.getViewTreeObserver().addOnPreDrawListener( final ViewGroup overlayView = mOverlays[i].getRootView();
new RestartingPreDrawListener(overlayView, i, newRotation)); overlayView.getViewTreeObserver().addOnPreDrawListener(
new RestartingPreDrawListener(overlayView, i, newRotation));
}
} }
} }

2
packages/SystemUI/src/com/android/systemui/decor/RoundedCornerDecorProviderImpl.kt
View File

@@ -105,7 +105,7 @@ private fun Int.toLayoutGravity(@Surface.Rotation rotation: Int): Int = when (ro
DisplayCutout.BOUNDS_POSITION_LEFT -> Gravity.BOTTOM DisplayCutout.BOUNDS_POSITION_LEFT -> Gravity.BOTTOM
DisplayCutout.BOUNDS_POSITION_TOP -> Gravity.LEFT DisplayCutout.BOUNDS_POSITION_TOP -> Gravity.LEFT
DisplayCutout.BOUNDS_POSITION_RIGHT -> Gravity.TOP DisplayCutout.BOUNDS_POSITION_RIGHT -> Gravity.TOP
else /* DisplayCutout.BOUNDS_POSITION_BOTTOM */ -> Gravity.LEFT else /* DisplayCutout.BOUNDS_POSITION_BOTTOM */ -> Gravity.RIGHT
} }
Surface.ROTATION_270 -> when (this) { Surface.ROTATION_270 -> when (this) {
DisplayCutout.BOUNDS_POSITION_LEFT -> Gravity.TOP DisplayCutout.BOUNDS_POSITION_LEFT -> Gravity.TOP