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

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

Merge "Use ContentPreview's thumbnail loader rather than ImageUtil."

parents 45b1f5ad 07acade1

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -120,7 +120,6 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; 
import com.android.internal.content.PackageMonitor;

import com.android.internal.content.PackageMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.util.ImageUtils;

import com.android.internal.widget.GridLayoutManager;

import com.android.internal.widget.GridLayoutManager;

import com.android.internal.widget.RecyclerView;

import com.android.internal.widget.RecyclerView;

import com.android.internal.widget.ResolverDrawerLayout;

import com.android.internal.widget.ResolverDrawerLayout;
@@ -345,7 +344,9 @@ public class ChooserActivity extends ResolverActivity implements 
            mHandler.sendEmptyMessageDelayed(IMAGE_LOAD_TIMEOUT, mImageLoadTimeoutMillis);

            mHandler.sendEmptyMessageDelayed(IMAGE_LOAD_TIMEOUT, mImageLoadTimeoutMillis);





            AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {

            AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {

                final Bitmap bmp = loadThumbnail(uri, new Size(200, 200));

                int size = getResources().getDimensionPixelSize(

                        R.dimen.chooser_preview_image_max_dimen);

                final Bitmap bmp = loadThumbnail(uri, new Size(size, size));

                final Message msg = Message.obtain();

                final Message msg = Message.obtain();

                msg.what = IMAGE_LOAD_INTO_VIEW;

                msg.what = IMAGE_LOAD_INTO_VIEW;

                msg.obj = new LoadUriTask(imageResourceId, uri, extraImages, bmp);

                msg.obj = new LoadUriTask(imageResourceId, uri, extraImages, bmp);
@@ -2127,7 +2128,7 @@ public class ChooserActivity extends ResolverActivity implements 
        }

        }





        try {

        try {

            return ImageUtils.loadThumbnail(getContentResolver(), uri, size);

            return getContentResolver().loadThumbnail(uri, size, null);

        } catch (IOException | NullPointerException | SecurityException ex) {

        } catch (IOException | NullPointerException | SecurityException ex) {

            logContentPreviewWarning(uri);

            logContentPreviewWarning(uri);

        }

        }

core/res/res/values/dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -760,6 +760,7 @@ 
    <dimen name="chooser_edge_margin_normal">24dp</dimen>

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

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

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

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

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

    <dimen name="chooser_preview_image_max_dimen">200dp</dimen>

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

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

    <dimen name="chooser_target_width">90dp</dimen>

    <dimen name="chooser_target_width">90dp</dimen>

    <dimen name="chooser_header_scroll_elevation">4dp</dimen>

    <dimen name="chooser_header_scroll_elevation">4dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2722,6 +2722,7 @@ 
  <java-symbol type="layout" name="chooser_grid_preview_file" />

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

  <java-symbol type="id" name="chooser_row_text_option" />

  <java-symbol type="id" name="chooser_row_text_option" />

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

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

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

  <java-symbol type="integer" name="config_maxShortcutTargetsPerApp" />

  <java-symbol type="integer" name="config_maxShortcutTargetsPerApp" />

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

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

  <java-symbol type="id" name="day_picker_view_pager" />

  <java-symbol type="id" name="day_picker_view_pager" />