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

Commit 60cadb23 authored by James O'Leary's avatar James O'Leary Committed by Android (Google) Code Review
Browse files

Merge "Add shadow to voice assistant handles"

parents c40091bf 936f8479

core/res/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -772,4 +772,8 @@ 
    <dimen name="resolver_small_margin">18dp</dimen>

    <dimen name="resolver_edge_margin">24dp</dimen>

    <dimen name="resolver_elevation">1dp</dimen>



    <!-- Assistant handles -->

    <dimen name="assist_handle_shadow_radius">2dp</dimen>



</resources>

core/res/res/values/symbols.xml

+5 −0
Original line number Diff line number Diff line
@@ -3790,4 +3790,9 @@ 
  <!-- For contacts provider. -->

  <java-symbol type="string" name="config_rawContactsLocalAccountName" />

  <java-symbol type="string" name="config_rawContactsLocalAccountType" />



  <!-- Assistant handles -->

  <java-symbol type="dimen" name="assist_handle_shadow_radius" />





</resources>

packages/SystemUI/src/com/android/systemui/CornerHandleView.java

+8 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class CornerHandleView extends View { 
        mPaint.setStyle(Paint.Style.STROKE);

        mPaint.setStrokeCap(Paint.Cap.ROUND);

        mPaint.setStrokeWidth(getStrokePx());

        setLayerType(View.LAYER_TYPE_SOFTWARE, mPaint);



        final int dualToneDarkTheme = Utils.getThemeAttr(mContext, R.attr.darkIconTheme);

        final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);
@@ -114,10 +115,17 @@ public class CornerHandleView extends View { 
     * appropriately. Intention is to match the home handle color.

     */

    public void updateDarkness(float darkIntensity) {

        // Handle color is same as home handle color.

        int color = (int) ArgbEvaluator.getInstance().evaluate(darkIntensity,

                mLightColor, mDarkColor);

        // Shadow color is inverse of handle color.

        int shadowColor = (int) ArgbEvaluator.getInstance().evaluate(darkIntensity,

                mDarkColor, mLightColor);

        if (mPaint.getColor() != color) {

            mPaint.setColor(color);

            mPaint.setShadowLayer(/** radius */ getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.assist_handle_shadow_radius), /** shadowDx */ 0,

                    /** shadowDy */ 0, /** color */ shadowColor);

            if (getVisibility() == VISIBLE && getAlpha() > 0) {

                invalidate();

            } else {