Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36f9aa75 authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Apply android:attr/dialogCornerRadius to widgets picker dialog top corners" into sc-dev

parents 2c880a32 400493c7

res/drawable-v28/widgets_bottom_sheet_background.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="@color/widgets_picker_surface" />

    <corners

        android:topLeftRadius="?android:attr/dialogCornerRadius"

        android:topRightRadius="?android:attr/dialogCornerRadius"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"

        />

</shape>
 
 No newline at end of file

res/drawable/widgets_bottom_sheet_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    android:shape="rectangle">

    <solid android:color="@color/widgets_picker_surface" />

    <corners

        android:topLeftRadius="@dimen/bg_round_rect_radius"

        android:topRightRadius="@dimen/bg_round_rect_radius"

        android:topLeftRadius="@dimen/default_dialog_corner_radius"

        android:topRightRadius="@dimen/default_dialog_corner_radius"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"

        />

src/com/android/launcher3/views/TopRoundedCornerView.java

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.graphics.Paint; 
import android.graphics.Path;

import android.graphics.RectF;

import android.util.AttributeSet;

import android.widget.FrameLayout;



import com.android.launcher3.R;

import com.android.launcher3.util.Themes;
@@ -41,7 +40,7 @@ public class TopRoundedCornerView extends SpringRelativeLayout { 
    public TopRoundedCornerView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);



        int radius = getResources().getDimensionPixelSize(R.dimen.bg_round_rect_radius);

        float radius = Themes.getDialogCornerRadius(context);

        mRadii = new float[] {radius, radius, radius, radius, 0, 0, 0, 0};



        mNavBarScrimPaint = new Paint();