Commit: 298304e0b42263e540bcf02951b24574843a3064 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: 298304e0b42263e540bcf02951b24574843a3064 (tree)
• Time: 2020-07-23 22:21:01
• Author: utzcoz <utzcoz@outl...>
• Commiter: utzcoz

Log Message

Impl basic window round corner with Outline

Signed-off-by: utzcoz <[e-mail]>

Change Summary

• modified: core/java/com/android/internal/policy/DecorView.java
• modified: core/res/res/values/dimens.xml
• modified: core/res/res/values/symbols.xml

Incremental Difference

--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -250,6 +250,15 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
     private final Paint mVerticalResizeShadowPaint = new Paint();
     private final Paint mHorizontalResizeShadowPaint = new Paint();
 
+    // region @boringdroid
+    private float mWindowCornerRadius = 8;
+    private ViewOutlineProvider mWindowOutline = new ViewOutlineProvider() {
+        @Override
+        public void getOutline(View view, Outline outline) {
+            outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), mWindowCornerRadius);
+        }
+    };
+    // endregion
     DecorView(Context context, int featureId, PhoneWindow window,
             WindowManager.LayoutParams params) {
         super(context);
@@ -277,6 +286,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
         mResizeShadowSize = context.getResources().getDimensionPixelSize(
                 R.dimen.resize_shadow_size);
         initResizingPaints();
+        // region @boringdroid
+        mWindowCornerRadius = context.getResources().getDimension(R.dimen.decor_corner_radius);
+        // endregion
     }
 
     void setBackgroundFallback(int resId) {
@@ -1853,6 +1865,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
             // Configuration now requires a caption.
             final LayoutInflater inflater = mWindow.getLayoutInflater();
             mDecorCaptionView = createDecorCaptionView(inflater);
+            // region @boringdroid
+            updateWindowCorner();
+            // endregion
             if (mDecorCaptionView != null) {
                 if (mDecorCaptionView.getParent() == null) {
                     addView(mDecorCaptionView, 0,
@@ -1882,6 +1897,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
         }
 
         mDecorCaptionView = createDecorCaptionView(inflater);
+        // region @boringdroid
+        updateWindowCorner();
+        // endregion
         final View root = inflater.inflate(layoutResource, null);
         if (mDecorCaptionView != null) {
             if (mDecorCaptionView.getParent() == null) {
@@ -1987,6 +2005,17 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
         }
     }
 
+    // region @boringdroid
+    private void updateWindowCorner() {
+        if (mDecorCaptionView == null) {
+            setClipToOutline(false);
+            setOutlineProvider(null);
+        } else {
+            setOutlineProvider(mWindowOutline);
+            setClipToOutline(true);
+        }
+    }
+    // endregion
     void updateDecorCaptionShade() {
         if (mDecorCaptionView != null) {
             setDecorCaptionShade(getContext(), mDecorCaptionView);

--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -694,4 +694,7 @@
     <dimen name="harmful_app_message_padding_bottom">24dp</dimen>
     <!-- Line spacing modifier for the message field of the harmful app dialog -->
     <item name="harmful_app_message_line_spacing_modifier" type="dimen">1.22</item>
+    <!-- region @boringdroid -->
+    <item name="decor_corner_radius" type="dimen">8dp</item>
+    <!-- endregion -->
 </resources>

--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2241,6 +2241,7 @@
   <java-symbol type="id" name="back_window" />
   <java-symbol type="drawable" name="decor_back_button_dark" />
   <java-symbol type="drawable" name="decor_back_button_light" />
+  <java-symbol type="dimen" name="decor_corner_radius" />
   <!-- endregion -->
   <java-symbol type="color" name="decor_button_dark_color" />
   <java-symbol type="color" name="decor_button_light_color" />