diff options
5 files changed, 10 insertions, 11 deletions
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml index cf57e1dce..16f75313c 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml @@ -27,6 +27,7 @@ <dimen name="button_touch_size">48dp</dimen> <dimen name="root_icon_size">24dp</dimen> <dimen name="thumbnail_clip_corner_radius">6dp</dimen> + <dimen name="thumbnail_border_width">1dp</dimen> <!-- TODO(b/379776735): remove this block after use_material3 flag is launched. --> <dimen name="root_icon_margin">0dp</dimen> <dimen name="root_spacer_padding">0dp</dimen> @@ -37,7 +38,6 @@ <dimen name="check_icon_size">20dp</dimen> <dimen name="zoom_icon_size">24dp</dimen> <dimen name="list_item_thumbnail_size">40dp</dimen> - <dimen name="list_item_thumbnail_border_width">2dp</dimen> <dimen name="grid_item_icon_size">30dp</dimen> <!-- TODO(b/379776735): remove this after use_material3 flag is launched. --> <dimen name="progress_bar_height">4dp</dimen> @@ -77,7 +77,6 @@ <dimen name="grid_item_thumbnail_width">80dp</dimen> <dimen name="grid_item_thumbnail_height">80dp</dimen> <dimen name="grid_item_thumbnail_radius">12dp</dimen> - <dimen name="grid_item_thumbnail_border_width">2dp</dimen> <dimen name="grid_item_icon_width">64dp</dimen> <dimen name="grid_item_icon_height">64dp</dimen> <dimen name="grid_item_layout_margin">@dimen/space_small_1</dimen> diff --git a/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/src/com/android/documentsui/dirlist/GridDocumentHolder.java index 67ee1f2bf..703f870e2 100644 --- a/src/com/android/documentsui/dirlist/GridDocumentHolder.java +++ b/src/com/android/documentsui/dirlist/GridDocumentHolder.java @@ -95,7 +95,7 @@ final class GridDocumentHolder extends DocumentHolder { mIconCheck = null; mThumbnailStrokeWidth = context.getResources() - .getDimensionPixelSize(R.dimen.grid_item_thumbnail_border_width); + .getDimensionPixelSize(R.dimen.thumbnail_border_width); } else { mBullet = null; mIconWrapper = null; diff --git a/src/com/android/documentsui/dirlist/ListDocumentHolder.java b/src/com/android/documentsui/dirlist/ListDocumentHolder.java index d91c9547e..a0db097d0 100644 --- a/src/com/android/documentsui/dirlist/ListDocumentHolder.java +++ b/src/com/android/documentsui/dirlist/ListDocumentHolder.java @@ -109,7 +109,7 @@ final class ListDocumentHolder extends DocumentHolder { if (isUseMaterial3FlagEnabled()) { mThumbnailStrokeWidth = context.getResources() - .getDimensionPixelSize(R.dimen.list_item_thumbnail_border_width); + .getDimensionPixelSize(R.dimen.thumbnail_border_width); int clipCornerRadius = context.getResources() .getDimensionPixelSize(R.dimen.thumbnail_clip_corner_radius); IconUtils.applyThumbnailClipOutline( diff --git a/src/com/android/documentsui/loaders/BaseFileLoader.kt b/src/com/android/documentsui/loaders/BaseFileLoader.kt index dd76217ac..fcb1d4cb0 100644 --- a/src/com/android/documentsui/loaders/BaseFileLoader.kt +++ b/src/com/android/documentsui/loaders/BaseFileLoader.kt @@ -77,7 +77,7 @@ abstract class BaseFileLoader( private var mResult: DirectoryResult? = null override fun cancelLoadInBackground() { - Log.d(TAG, "BasedFileLoader.cancelLoadInBackground") + Log.d(TAG, "${this::class.simpleName}.cancelLoadInBackground") super.cancelLoadInBackground() synchronized(this) { @@ -86,7 +86,7 @@ abstract class BaseFileLoader( } override fun deliverResult(result: DirectoryResult?) { - Log.d(TAG, "BasedFileLoader.deliverResult") + Log.d(TAG, "${this::class.simpleName}.deliverResult") if (isReset) { closeResult(result) return @@ -104,7 +104,7 @@ abstract class BaseFileLoader( } override fun onStartLoading() { - Log.d(TAG, "BasedFileLoader.onStartLoading") + Log.d(TAG, "${this::class.simpleName}.onStartLoading") val isCursorStale: Boolean = checkIfCursorStale(mResult) if (mResult != null && !isCursorStale) { deliverResult(mResult) @@ -115,17 +115,17 @@ abstract class BaseFileLoader( } override fun onStopLoading() { - Log.d(TAG, "BasedFileLoader.onStopLoading") + Log.d(TAG, "${this::class.simpleName}.onStopLoading") cancelLoad() } override fun onCanceled(result: DirectoryResult?) { - Log.d(TAG, "BasedFileLoader.onCanceled") + Log.d(TAG, "${this::class.simpleName}.onCanceled") closeResult(result) } override fun onReset() { - Log.d(TAG, "BasedFileLoader.onReset") + Log.d(TAG, "${this::class.simpleName}.onReset") super.onReset() // Ensure the loader is stopped diff --git a/src/com/android/documentsui/loaders/FolderLoader.kt b/src/com/android/documentsui/loaders/FolderLoader.kt index a166ca752..40c15dfe1 100644 --- a/src/com/android/documentsui/loaders/FolderLoader.kt +++ b/src/com/android/documentsui/loaders/FolderLoader.kt @@ -60,7 +60,7 @@ class FolderLoader( mListedDir.authority, mListedDir.documentId ) - var cursor = + val cursor = queryLocation(mRoot.rootId, folderChildrenUri, mOptions.otherQueryArgs, ALL_RESULTS) ?: emptyCursor() cursor.registerContentObserver(mObserver) |