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

Commit 07acade1 authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

Use ContentPreview's thumbnail loader rather than ImageUtil.

It includes extra orientation handling.

Bug: 145968771
Test: Manual per bug; atest ChooserActivityTest
Change-Id: Ic237c4ae4ddfbe11b317ec41c3b8a92b590369ce
parent 4d21ff0a
Loading
Loading
Loading
Loading
+4 −3
Original line number 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.logging.MetricsLogger;
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.RecyclerView;
import com.android.internal.widget.ResolverDrawerLayout;
@@ -345,7 +344,9 @@ public class ChooserActivity extends ResolverActivity implements
            mHandler.sendEmptyMessageDelayed(IMAGE_LOAD_TIMEOUT, mImageLoadTimeoutMillis);

            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();
                msg.what = IMAGE_LOAD_INTO_VIEW;
                msg.obj = new LoadUriTask(imageResourceId, uri, extraImages, bmp);
@@ -2127,7 +2128,7 @@ public class ChooserActivity extends ResolverActivity implements
        }

        try {
            return ImageUtils.loadThumbnail(getContentResolver(), uri, size);
            return getContentResolver().loadThumbnail(uri, size, null);
        } catch (IOException | NullPointerException | SecurityException ex) {
            logContentPreviewWarning(uri);
        }
+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@
    <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_image_max_dimen">200dp</dimen>
    <dimen name="chooser_preview_width">-1px</dimen>
    <dimen name="chooser_target_width">90dp</dimen>
    <dimen name="chooser_header_scroll_elevation">4dp</dimen>
+1 −0
Original line number Diff line number Diff line
@@ -2720,6 +2720,7 @@
  <java-symbol type="layout" name="chooser_grid_preview_file" />
  <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_preview_image_max_dimen"/>
  <java-symbol type="integer" name="config_maxShortcutTargetsPerApp" />
  <java-symbol type="layout" name="resolve_grid_item" />
  <java-symbol type="id" name="day_picker_view_pager" />