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

Commit 2bf44c10 authored by Ivan Chiang's avatar Ivan Chiang Committed by Android (Google) Code Review
Browse files

Merge "Refactor some codes for unbundle (4/N)"

parents 844989ea 73289e8d

src/com/android/documentsui/ActionModeController.java

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ public class ActionModeController extends SelectionObserver<String> 
    public boolean onCreateActionMode(ActionMode mode, Menu menu) {

        int size = mSelectionMgr.getSelection().size();

        mode.getMenuInflater().inflate(R.menu.action_mode_menu, menu);

        mode.setTitle(TextUtils.formatSelectedCount(size));

        mode.setTitle(mActivity.getResources().getQuantityString(R.plurals.selected_count, size));



        if (size > 0) {

src/com/android/documentsui/archives/ReadableArchive.java

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.FileUtils;

import android.os.Handler;

import android.os.Looper;

import android.os.ParcelFileDescriptor;

import android.os.storage.StorageManager;

import android.provider.DocumentsContract;
@@ -239,8 +241,8 @@ public class ReadableArchive extends Archive { 
        }



        try {

            return mStorageManager.openProxyFileDescriptor(

                    MODE_READ_ONLY, new Proxy(mZipFile, entry));

            return mStorageManager.openProxyFileDescriptor(MODE_READ_ONLY,

                    new Proxy(mZipFile, entry), new Handler(Looper.getMainLooper()));

        } catch (IOException e) {

            throw new IllegalStateException(e);

        }

src/com/android/documentsui/inspector/HeaderView.java

+2 −5
Original line number Diff line number Diff line
@@ -20,16 +20,14 @@ import android.content.Context; 
import android.graphics.Bitmap;

import android.graphics.Point;

import android.graphics.drawable.Drawable;

import android.text.Selection;

import android.text.Spannable;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;

import android.widget.ImageView.ScaleType;

import android.widget.RelativeLayout;

import android.widget.TextView;



import com.android.documentsui.IconUtils;

import com.android.documentsui.ProviderExecutor;

import com.android.documentsui.R;

import com.android.documentsui.ThumbnailLoader;
@@ -104,8 +102,7 @@ public final class HeaderView extends RelativeLayout implements HeaderDisplay { 
            mThumbnail.setScaleType(ScaleType.CENTER_CROP);

            mThumbnail.setImageBitmap(thumbnail);

        } else {

            Drawable mimeIcon =

                    mContext.getContentResolver().getTypeDrawable(info.mimeType);

            Drawable mimeIcon = IconUtils.loadMimeIcon(mContext, info.mimeType);

            mThumbnail.setScaleType(ScaleType.FIT_CENTER);

            mThumbnail.setImageDrawable(mimeIcon);

        }

src/com/android/documentsui/ui/OperationProgressDialog.java

+4 −7
Original line number Diff line number Diff line
@@ -18,20 +18,17 @@ package com.android.documentsui.ui; 


import android.app.Activity;

import android.app.ProgressDialog;

import android.content.DialogInterface;

import android.os.Handler;

import android.os.Message;

import android.text.format.DateUtils;



import androidx.annotation.StringRes;



import com.android.documentsui.R;

import com.android.documentsui.services.FileOperation;

import com.android.documentsui.services.FileOperationService.MessageType;

import com.android.documentsui.services.FileOperationService.OpType;

import com.android.documentsui.services.FileOperationService;

import com.android.documentsui.services.FileOperations;



import androidx.annotation.StringRes;

import android.util.Log;

import com.android.documentsui.util.FormatUtils;



public class OperationProgressDialog {
@@ -74,7 +71,7 @@ public class OperationProgressDialog { 
                        }

                        if (message.arg2 > 0) {

                            mDialog.setMessage(mActivity.getString(R.string.copy_remaining,

                                    DateUtils.formatDuration(message.arg2)));

                                    FormatUtils.formatDuration(message.arg2)));

                        }

                        return true;

                    case FileOperationService.MESSAGE_FINISH: