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

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

Merge "Remove drop shadow from corner handles."

parents 5dc2fab5 ef1c687d

core/res/res/values/dimens.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -781,9 +781,6 @@ 




    <dimen name="chooser_action_button_icon_size">18dp</dimen>

    <dimen name="chooser_action_button_icon_size">18dp</dimen>





    <!-- Assistant handles -->

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



    <!-- For Waterfall Display -->

    <!-- For Waterfall Display -->

    <dimen name="waterfall_display_left_edge_size">0px</dimen>

    <dimen name="waterfall_display_left_edge_size">0px</dimen>

    <dimen name="waterfall_display_top_edge_size">0px</dimen>

    <dimen name="waterfall_display_top_edge_size">0px</dimen>

core/res/res/values/symbols.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -3840,9 +3840,6 @@ 
  <!-- For App Standby -->

  <!-- For App Standby -->

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

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





  <!-- Assistant handles -->

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



  <!-- For Waterfall Display -->

  <!-- For Waterfall Display -->

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

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

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

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

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

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

        mPaint.setStyle(Paint.Style.STROKE);

        mPaint.setStrokeCap(Paint.Cap.ROUND);

        mPaint.setStrokeCap(Paint.Cap.ROUND);

        mPaint.setStrokeWidth(getStrokePx());

        mPaint.setStrokeWidth(getStrokePx());

        setLayerType(View.LAYER_TYPE_SOFTWARE, mPaint);





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

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

        final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);

        final int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme);
@@ -118,14 +117,8 @@ public class CornerHandleView extends View { 
        // Handle color is same as home handle color.

        // Handle color is same as home handle color.

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

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

                mLightColor, mDarkColor);

                mLightColor, mDarkColor);

        // Shadow color is inverse of handle color.

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

                mDarkColor, mLightColor);

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

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

            mPaint.setColor(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) {

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

                invalidate();

                invalidate();

            } else {

            } else {