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

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

Merge "Sharesheet - Add outline to image preview" into qt-dev

parents b4d7e8f4 9aaf00c5

core/java/com/android/internal/app/ChooserActivity.java

+15 −4
Original line number Diff line number Diff line
@@ -3055,6 +3055,7 @@ public class ChooserActivity extends ResolverActivity { 
        private int mRadius = 0;

        private Path mPath = new Path();

        private Paint mOverlayPaint = new Paint(0);

        private Paint mRoundRectPaint = new Paint(0);

        private Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

        private String mExtraImageCount = null;
@@ -3078,6 +3079,11 @@ public class ChooserActivity extends ResolverActivity { 
            mOverlayPaint.setColor(0x99000000);

            mOverlayPaint.setStyle(Paint.Style.FILL);



            mRoundRectPaint.setColor(context.getResources().getColor(R.color.chooser_row_divider));

            mRoundRectPaint.setStyle(Paint.Style.STROKE);

            mRoundRectPaint.setStrokeWidth(context.getResources()

                    .getDimensionPixelSize(R.dimen.chooser_preview_image_border));



            mTextPaint.setColor(Color.WHITE);

            mTextPaint.setTextSize(context.getResources()

                    .getDimensionPixelSize(R.dimen.chooser_preview_image_font_size));
@@ -3087,8 +3093,8 @@ public class ChooserActivity extends ResolverActivity { 
        private void updatePath(int width, int height) {

            mPath.reset();



            int imageWidth = width - getPaddingRight();

            int imageHeight = height - getPaddingBottom();

            int imageWidth = width - getPaddingRight() - getPaddingLeft();

            int imageHeight = height - getPaddingBottom() - getPaddingTop();

            mPath.addRoundRect(getPaddingLeft(), getPaddingTop(), imageWidth, imageHeight, mRadius,

                    mRadius, Path.Direction.CW);

        }
@@ -3120,7 +3126,6 @@ public class ChooserActivity extends ResolverActivity { 
            updatePath(width, height);

        }





        @Override

        protected void onDraw(Canvas canvas) {

            if (mRadius != 0) {
@@ -3129,8 +3134,12 @@ public class ChooserActivity extends ResolverActivity { 


            super.onDraw(canvas);



            int x = getPaddingLeft();

            int y = getPaddingRight();

            int width = getWidth() - getPaddingRight() - getPaddingLeft();

            int height = getHeight() - getPaddingBottom() - getPaddingTop();

            if (mExtraImageCount != null) {

                canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), mOverlayPaint);

                canvas.drawRect(x, y, width, height, mOverlayPaint);



                int xPos = canvas.getWidth() / 2;

                int yPos = (int) ((canvas.getHeight() / 2.0f)
@@ -3138,6 +3147,8 @@ public class ChooserActivity extends ResolverActivity { 


                canvas.drawText(mExtraImageCount, xPos, yPos, mTextPaint);

            }



            canvas.drawRoundRect(x, y, width, height, mRadius, mRadius, mRoundRectPaint);

        }

    }

}

core/res/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -724,6 +724,7 @@ 
    <dimen name="chooser_edge_margin_thin">16dp</dimen>

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

    <dimen name="chooser_preview_image_font_size">20sp</dimen>

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

    <dimen name="chooser_preview_width">-1px</dimen>

    <dimen name="resolver_icon_size">42dp</dimen>

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

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2777,6 +2777,7 @@ 
  <java-symbol type="dimen" name="chooser_edge_margin_normal" />

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

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

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

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

  <java-symbol type="layout" name="chooser_grid" />

  <java-symbol type="layout" name="chooser_grid_preview_text" />
@@ -2790,6 +2791,7 @@ 
  <java-symbol type="drawable" name="scroll_indicator_material" />



  <java-symbol type="layout" name="chooser_row" />

  <java-symbol type="color" name="chooser_row_divider" />

  <java-symbol type="layout" name="chooser_row_direct_share" />

  <java-symbol type="bool" name="config_supportDoubleTapWake" />

  <java-symbol type="drawable" name="ic_perm_device_info" />