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

Commit de30ace4 authored by Alina Zaidi's avatar Alina Zaidi Committed by Automerger Merge Worker
Browse files

Merge "Remove scrim from navigation bar from full widget picker." into sc-dev am: 57cdcceb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15095782

Change-Id: Ia60f26b7a13c8404ad26701c824921ae8da5ec37
parents 9f867ac8 57cdcceb
Loading
Loading
Loading
Loading
+0 −20
Original line number Diff line number Diff line
@@ -17,12 +17,10 @@ package com.android.launcher3.views;

import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.RectF;
import android.util.AttributeSet;

import com.android.launcher3.R;
import com.android.launcher3.util.Themes;

/**
@@ -34,41 +32,23 @@ public class TopRoundedCornerView extends SpringRelativeLayout {
    private final Path mClipPath = new Path();
    private float[] mRadii;

    private final Paint mNavBarScrimPaint;
    private int mNavBarScrimHeight = 0;

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

        float radius = Themes.getDialogCornerRadius(context);
        mRadii = new float[] {radius, radius, radius, radius, 0, 0, 0, 0};

        mNavBarScrimPaint = new Paint();
        mNavBarScrimPaint.setColor(Themes.getAttrColor(context, R.attr.allAppsNavBarScrimColor));
    }

    public TopRoundedCornerView(Context context, AttributeSet attrs) {
        this(context, attrs, 0);
    }

    public void setNavBarScrimHeight(int height) {
        if (mNavBarScrimHeight != height) {
            mNavBarScrimHeight = height;
            invalidate();
        }
    }

    @Override
    public void draw(Canvas canvas) {
        canvas.save();
        canvas.clipPath(mClipPath);
        super.draw(canvas);
        canvas.restore();

        if (mNavBarScrimHeight > 0) {
            canvas.drawRect(0, getHeight() - mNavBarScrimHeight, getWidth(), getHeight(),
                    mNavBarScrimPaint);
        }
    }

    @Override
+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet
            clearNavBarColor();
        }

        ((TopRoundedCornerView) mContent).setNavBarScrimHeight(mInsets.bottom);
        requestLayout();
    }