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

Commit fe560d80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update widget full sheet / bottom sheet to have top rounded corners."... 

Merge "Update widget full sheet / bottom sheet to have top rounded corners." into ub-launcher3-master
parents f1e9a706 84e24362

res/drawable/round_rect_primary.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <solid android:color="?android:attr/colorPrimary" />

    <corners android:radius="8dp" />

    <corners android:radius="@dimen/bg_round_rect_radius" />

</shape>

res/drawable/top_round_rect_primary.xml

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

<!--

     Copyright (C) 2018 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="?android:attr/colorPrimary" />

    <corners

        android:topLeftRadius="@dimen/bg_round_rect_radius"

        android:topRightRadius="@dimen/bg_round_rect_radius"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"

        />

</shape>

res/layout/widgets_bottom_sheet.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="28dp"

    android:background="?android:attr/colorPrimary"

    android:background="@drawable/top_round_rect_primary"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:layout_gravity="bottom"

    android:theme="?attr/widgetsTheme">

res/layout/widgets_full_sheet.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <FrameLayout

    <com.android.launcher3.views.TopRoundedCornerView

        android:id="@+id/container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -60,5 +60,5 @@ 
            android:layout_gravity="bottom"

            android:background="?attr/allAppsNavBarScrimColor"

            android:focusable="false"  />

    </FrameLayout>

    </com.android.launcher3.views.TopRoundedCornerView>

</com.android.launcher3.widget.WidgetsFullSheet>
 
 No newline at end of file

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

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.

 */

package com.android.launcher3.views;



import android.content.Context;

import android.graphics.Canvas;

import android.graphics.Path;

import android.graphics.RectF;

import android.util.AttributeSet;

import android.widget.FrameLayout;



import com.android.launcher3.R;



/**

 * View with top rounded corners.

 */

public class TopRoundedCornerView extends FrameLayout {



    private final RectF mRect = new RectF();

    private final Path mClipPath = new Path();

    private float[] mRadii;



    public TopRoundedCornerView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);



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

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

    }



    public TopRoundedCornerView(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

    }



    @Override

    public void draw(Canvas canvas) {

        canvas.save();

        canvas.clipPath(mClipPath);

        super.draw(canvas);

        canvas.restore();

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        mRect.set(0, 0, getMeasuredWidth(), getMeasuredHeight());

        mClipPath.reset();

        mClipPath.addRoundRect(mRect, mRadii, Path.Direction.CW);

    }

}