openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Steven Ng 2021-05-20 23:46:53 +00:00 committed by Android (Google) Code Review
parent 2c880a321d 400493c70c
commit 36f9aa7530
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
res/drawable-v28/widgets_bottom_sheet_background.xml Normal file
View File

@ -0,0 +1,26 @@
<?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>

4
res/drawable/widgets_bottom_sheet_background.xml
View File

@ -18,8 +18,8 @@
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@color/widgets_picker_surface" /> <solid android:color="@color/widgets_picker_surface" />
<corners <corners
android:topLeftRadius="@dimen/bg_round_rect_radius" android:topLeftRadius="@dimen/default_dialog_corner_radius"
android:topRightRadius="@dimen/bg_round_rect_radius" android:topRightRadius="@dimen/default_dialog_corner_radius"
android:bottomLeftRadius="0dp" android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp" android:bottomRightRadius="0dp"
/> />

3
src/com/android/launcher3/views/TopRoundedCornerView.java
View File

@ -21,7 +21,6 @@ import android.graphics.Paint;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.RectF; import android.graphics.RectF;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.FrameLayout;
import com.android.launcher3.R; import com.android.launcher3.R;
import com.android.launcher3.util.Themes; import com.android.launcher3.util.Themes;
@ -41,7 +40,7 @@ public class TopRoundedCornerView extends SpringRelativeLayout {
public TopRoundedCornerView(Context context, AttributeSet attrs, int defStyleAttr) { public TopRoundedCornerView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, 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}; mRadii = new float[] {radius, radius, radius, radius, 0, 0, 0, 0};
mNavBarScrimPaint = new Paint(); mNavBarScrimPaint = new Paint();