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

Commit d147efce authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Use type inference where possible."

parents 2207fa02 fefcd700

src/com/android/documentsui/BaseActivity.java

+2 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.documentsui.DirectoryFragment.ANIM_SIDE; 
import static com.android.documentsui.DirectoryFragment.ANIM_UP;

import static com.android.internal.util.Preconditions.checkArgument;



import android.annotation.Nullable;

import android.app.Activity;

import android.app.Fragment;

import android.content.Intent;
@@ -38,6 +37,7 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Root;

import android.support.annotation.Nullable;

import android.util.Log;

import android.util.SparseArray;

import android.view.LayoutInflater;
@@ -60,8 +60,6 @@ import com.android.documentsui.model.DocumentStack; 
import com.android.documentsui.model.DurableUtils;

import com.android.documentsui.model.RootInfo;



import com.google.common.collect.Maps;



import libcore.io.IoUtils;



import java.io.FileNotFoundException;
@@ -371,7 +369,7 @@ abstract class BaseActivity extends Activity { 
        public String currentSearch;



        /** Instance state for every shown directory */

        public HashMap<String, SparseArray<Parcelable>> dirState = Maps.newHashMap();

        public HashMap<String, SparseArray<Parcelable>> dirState = new HashMap<>();



        /** Currently copying file */

        public List<DocumentInfo> selectedDocumentsForCopy = new ArrayList<DocumentInfo>();

src/com/android/documentsui/CreateDirectoryFragment.java

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.documentsui;



import static com.android.documentsui.DocumentsActivity.TAG;

import static com.android.documentsui.Shared.TAG;



import android.app.AlertDialog;

import android.app.Dialog;
@@ -36,7 +36,6 @@ import android.util.Log; 
import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.View;

import android.view.inputmethod.EditorInfo;

import android.widget.EditText;

import android.widget.TextView;

import android.widget.TextView.OnEditorActionListener;

src/com/android/documentsui/DirectoryFragment.java

+15 −14
Original line number Diff line number Diff line
@@ -24,14 +24,13 @@ import static com.android.documentsui.BaseActivity.State.MODE_GRID; 
import static com.android.documentsui.BaseActivity.State.MODE_LIST;

import static com.android.documentsui.BaseActivity.State.MODE_UNKNOWN;

import static com.android.documentsui.BaseActivity.State.SORT_ORDER_UNKNOWN;

import static com.android.documentsui.DocumentsActivity.TAG;

import static com.android.documentsui.Shared.TAG;

import static com.android.documentsui.model.DocumentInfo.getCursorInt;

import static com.android.documentsui.model.DocumentInfo.getCursorLong;

import static com.android.documentsui.model.DocumentInfo.getCursorString;

import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.internal.util.Preconditions.checkState;



import android.annotation.NonNull;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.Fragment;
@@ -98,7 +97,7 @@ import com.android.documentsui.model.DocumentStack; 
import com.android.documentsui.model.RootInfo;

import com.android.internal.util.Preconditions;



import com.google.android.collect.Lists;

import com.google.common.collect.Lists;



import java.util.ArrayList;

import java.util.Collections;
@@ -235,8 +234,7 @@ public class DirectoryFragment extends Fragment { 
                    public void onLayoutChange(

                            View v, int left, int top, int right, int bottom, int oldLeft,

                            int oldTop, int oldRight, int oldBottom) {

                        int thumbSize = getResources().getDimensionPixelSize(R.dimen.grid_width);

                        mColumnCount = pickColumnCount(thumbSize);

                        mColumnCount = calculateColumnCount();

                        if (mGridLayout != null) {

                            mGridLayout.setSpanCount(mColumnCount);

                        }
@@ -573,13 +571,15 @@ public class DirectoryFragment extends Fragment { 
        mThumbSize = new Point(thumbSize, thumbSize);

    }



    private int pickColumnCount(final int thumbSize) {

        int itemPadding =

                getResources().getDimensionPixelSize(R.dimen.grid_item_margin);

    private int calculateColumnCount() {

        int cellWidth = getResources().getDimensionPixelSize(R.dimen.grid_width);

        int cellMargin = 2 * getResources().getDimensionPixelSize(R.dimen.grid_item_margin);

        int viewPadding = mRecView.getPaddingLeft() + mRecView.getPaddingRight();



        checkState(mRecView.getWidth() > 0);

        int columnCount = Math.max(1,

                (mRecView.getWidth() - viewPadding) / (thumbSize + itemPadding));

                (mRecView.getWidth() - viewPadding) / (cellWidth + cellMargin));



        return columnCount;

    }
@@ -753,7 +753,7 @@ public class DirectoryFragment extends Fragment { 
                Intent intent;



                // Filter out directories - those can't be shared.

                List<DocumentInfo> docsForSend = Lists.newArrayList();

                List<DocumentInfo> docsForSend = new ArrayList<>();

                for (DocumentInfo doc: docs) {

                    if (!Document.MIME_TYPE_DIR.equals(doc.mimeType)) {

                        docsForSend.add(doc);
@@ -774,8 +774,8 @@ public class DirectoryFragment extends Fragment { 
                    intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

                    intent.addCategory(Intent.CATEGORY_DEFAULT);



                    final ArrayList<String> mimeTypes = Lists.newArrayList();

                    final ArrayList<Uri> uris = Lists.newArrayList();

                    final ArrayList<String> mimeTypes = new ArrayList<>();

                    final ArrayList<Uri> uris = new ArrayList<>();

                    for (DocumentInfo doc : docsForSend) {

                        mimeTypes.add(doc.mimeType);

                        uris.add(doc.derivedUri);
@@ -956,7 +956,7 @@ public class DirectoryFragment extends Fragment { 
        private final Context mContext;

        private final LayoutInflater mInflater;

        // TODO: Bring back support for footers.

        private final List<Footer> mFooters = Lists.newArrayList();

        private final List<Footer> mFooters = new ArrayList<>();



        private Cursor mCursor;

        private int mCursorCount;
@@ -1330,7 +1330,7 @@ public class DirectoryFragment extends Fragment { 
        return MimePredicate.mimeMatches(state.acceptMimes, docMimeType);

    }



    private @NonNull List<DocumentInfo> getSelectedDocuments() {

    private List<DocumentInfo> getSelectedDocuments() {

        Selection sel = mSelectionManager.getSelection(new Selection());

        return getItemsAsDocuments(sel);

    }
@@ -1570,6 +1570,7 @@ public class DirectoryFragment extends Fragment { 
        final Cursor cursor = mAdapter.getItem(position);

        checkNotNull(cursor, "Cursor cannot be null.");

        final DocumentInfo doc = DocumentInfo.fromDirectoryCursor(cursor);



        return Lists.newArrayList(doc);

    }

src/com/android/documentsui/DirectoryLoader.java

+1 −3
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.documentsui;



import static com.android.documentsui.DocumentsActivity.TAG;

import static com.android.documentsui.BaseActivity.State.MODE_UNKNOWN;

import static com.android.documentsui.BaseActivity.State.SORT_ORDER_DISPLAY_NAME;

import static com.android.documentsui.BaseActivity.State.SORT_ORDER_LAST_MODIFIED;

import static com.android.documentsui.BaseActivity.State.SORT_ORDER_SIZE;

import static com.android.documentsui.BaseActivity.State.SORT_ORDER_UNKNOWN;

import static com.android.documentsui.Shared.TAG;

import static com.android.documentsui.model.DocumentInfo.getCursorInt;



import android.content.AsyncTaskLoader;
@@ -31,8 +31,6 @@ import android.content.Context; 
import android.database.Cursor;

import android.net.Uri;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.Looper;

import android.os.OperationCanceledException;

import android.os.RemoteException;

import android.provider.DocumentsContract;

src/com/android/documentsui/DocumentClipper.java

+5 −7
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.documentsui;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.ClipData;

import android.content.ClipboardManager;

import android.content.ContentProviderClient;
@@ -26,15 +24,15 @@ import android.content.Context; 
import android.database.Cursor;

import android.net.Uri;

import android.provider.DocumentsContract;

import android.support.annotation.Nullable;

import android.util.Log;



import com.android.documentsui.model.DocumentInfo;

import com.android.internal.util.Preconditions;



import com.google.android.collect.Lists;



import libcore.io.IoUtils;



import java.util.ArrayList;

import java.util.List;



/**
@@ -78,7 +76,7 @@ final class DocumentClipper { 
     * Returns a list of Documents as decoded from Clipboard primary clipdata.

     * This should be run from inside an AsyncTask.

     */

    public @NonNull List<DocumentInfo> getClippedDocuments() {

    public List<DocumentInfo> getClippedDocuments() {

        return getDocumentsFromClipData(mClipboard.getPrimaryClip());

    }
@@ -86,9 +84,9 @@ final class DocumentClipper { 
     * Returns a list of Documents as decoded in clipData.

     * This should be run from inside an AsyncTask.

     */

    public @NonNull List<DocumentInfo> getDocumentsFromClipData(ClipData clipData) {

    public List<DocumentInfo> getDocumentsFromClipData(ClipData clipData) {

        Preconditions.checkNotNull(clipData);

        final List<DocumentInfo> srcDocs = Lists.newArrayList();

        final List<DocumentInfo> srcDocs = new ArrayList<>();



        int count = clipData.getItemCount();

        if (count == 0) {