commit beeb7f4272c7ba1fe61324ced141455fc06967a5
author Adrian Roos <roosa@google.com> Thu May 31 19:54:53 2018 +0200
committer Daniel Sandler <dsandler@android.com> Fri Jun 08 19:55:21 2018 +0000
tree 7cc1111222fbab7917c8265ba7a8521be126c4d0
parent cb3dd2889cba3759f6a8392d9cccb37702186b18

ScreenDecorations: fix cutout not showing in seascape

Now that we invert the gravity in seascape and upside down,
we also need to invert which notch we draw in that window.

Change-Id: I28d892a433d47f65b227220278cbc56bbbb7e674
Fixes: 80530886
Test: Rotate phone to seascape, turn on emulated notch. verify notch overlay is drawing.

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
index efaf557..f5478c7 100644
--- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
+++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
@@ -89,6 +89,8 @@
     private float mDensity;
     private WindowManager mWindowManager;
     private int mRotation;
+    private DisplayCutoutView mCutoutTop;
+    private DisplayCutoutView mCutoutBottom;
 
     @Override
     public void start() {
@@ -135,14 +137,14 @@
     private void setupDecorations() {
         mOverlay = LayoutInflater.from(mContext)
                 .inflate(R.layout.rounded_corners, null);
-        DisplayCutoutView cutoutTop = new DisplayCutoutView(mContext, true,
+        mCutoutTop = new DisplayCutoutView(mContext, true,
                 this::updateWindowVisibilities);
-        ((ViewGroup)mOverlay).addView(cutoutTop);
+        ((ViewGroup)mOverlay).addView(mCutoutTop);
         mBottomOverlay = LayoutInflater.from(mContext)
                 .inflate(R.layout.rounded_corners, null);
-        DisplayCutoutView cutoutBottom = new DisplayCutoutView(mContext, false,
+        mCutoutBottom = new DisplayCutoutView(mContext, false,
                 this::updateWindowVisibilities);
-        ((ViewGroup)mBottomOverlay).addView(cutoutBottom);
+        ((ViewGroup)mBottomOverlay).addView(mCutoutBottom);
 
         mOverlay.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
         mOverlay.setAlpha(0);
@@ -172,8 +174,8 @@
                 ((ImageView) mOverlay.findViewById(R.id.right)).setImageTintList(tintList);
                 ((ImageView) mBottomOverlay.findViewById(R.id.left)).setImageTintList(tintList);
                 ((ImageView) mBottomOverlay.findViewById(R.id.right)).setImageTintList(tintList);
-                cutoutTop.setColor(tint);
-                cutoutBottom.setColor(tint);
+                mCutoutTop.setColor(tint);
+                mCutoutBottom.setColor(tint);
             }
         };
         setting.setListening(true);
@@ -245,6 +247,9 @@
             updateView(bottomRight, Gravity.TOP | Gravity.LEFT, 0);
         }
 
+        mCutoutTop.setRotation(mRotation);
+        mCutoutBottom.setRotation(mRotation);
+
         updateWindowVisibilities();
     }
 
@@ -416,14 +421,16 @@
         private final Rect mBoundingRect = new Rect();
         private final Path mBoundingPath = new Path();
         private final int[] mLocation = new int[2];
-        private final boolean mStart;
+        private final boolean mInitialStart;
         private final Runnable mVisibilityChangedListener;
         private int mColor = Color.BLACK;
+        private boolean mStart;
+        private int mRotation;
 
         public DisplayCutoutView(Context context, boolean start,
                 Runnable visibilityChangedListener) {
             super(context);
-            mStart = start;
+            mInitialStart = start;
             mVisibilityChangedListener = visibilityChangedListener;
             setId(R.id.display_cutout);
         }
@@ -475,7 +482,22 @@
             }
         }
 
+        public void setRotation(int rotation) {
+            mRotation = rotation;
+            update();
+        }
+
+        private boolean isStart() {
+            final boolean flipped = (mRotation == RotationUtils.ROTATION_SEASCAPE
+                    || mRotation == RotationUtils.ROTATION_UPSIDE_DOWN);
+            return flipped ? !mInitialStart : mInitialStart;
+        }
+
         private void update() {
+            mStart = isStart();
+            if (!isAttachedToWindow()) {
+                return;
+            }
             requestLayout();
             getDisplay().getDisplayInfo(mInfo);
             mBounds.setEmpty();