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

Commit 1046cfa5 authored by Ben Kwa's avatar Ben Kwa Committed by Android (Google) Code Review
Browse files

Merge "Move DirectoryFragment and family to dirlist pkg."

parents 0c553870 f862155e

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+9 −8
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package com.android.documentsui;



import static com.android.documentsui.DirectoryFragment.ANIM_DOWN;

import static com.android.documentsui.DirectoryFragment.ANIM_NONE;

import static com.android.documentsui.DirectoryFragment.ANIM_SIDE;

import static com.android.documentsui.DirectoryFragment.ANIM_UP;

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

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_DOWN;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_UP;

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



import android.app.Activity;
@@ -55,6 +55,7 @@ import android.widget.SearchView.OnQueryTextListener; 
import android.widget.TextView;



import com.android.documentsui.RecentsProvider.ResumeColumns;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.model.DocumentInfo;

import com.android.documentsui.model.DocumentStack;

import com.android.documentsui.model.DurableUtils;
@@ -69,7 +70,7 @@ import java.util.Collection; 
import java.util.List;

import java.util.concurrent.Executor;



abstract class BaseActivity extends Activity {

public abstract class BaseActivity extends Activity {



    static final String EXTRA_STATE = "state";
@@ -383,7 +384,7 @@ abstract class BaseActivity extends Activity { 
        invalidateOptionsMenu();

    }



    void onStateChanged() {

    public void onStateChanged() {

        invalidateOptionsMenu();

    }
@@ -421,7 +422,7 @@ abstract class BaseActivity extends Activity { 
        super.onRestoreInstanceState(state);

    }



    RootInfo getCurrentRoot() {

    public RootInfo getCurrentRoot() {

        if (mState.stack.root != null) {

            return mState.stack.root;

        } else {
@@ -825,7 +826,7 @@ abstract class BaseActivity extends Activity { 
     * Interface providing access to current view of documents

     * even when all documents are not homed to the same parent.

     */

    interface DocumentContext {

    public interface DocumentContext {

        /**

         * Returns the cursor for the selected document. The cursor can be used to retrieve

         * details about a document and its siblings.

packages/DocumentsUI/src/com/android/documentsui/DirectoryLoader.java

+1 −19
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ 
package com.android.documentsui;



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

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

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

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

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

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

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



import android.content.AsyncTaskLoader;
@@ -38,6 +36,7 @@ import android.provider.DocumentsContract.Document; 
import android.util.Log;



import com.android.documentsui.RecentsProvider.StateColumns;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.model.DocumentInfo;

import com.android.documentsui.model.RootInfo;
@@ -45,23 +44,6 @@ import libcore.io.IoUtils; 


import java.io.FileNotFoundException;



class DirectoryResult implements AutoCloseable {

    ContentProviderClient client;

    Cursor cursor;

    Exception exception;



    int mode = MODE_UNKNOWN;

    int sortOrder = SORT_ORDER_UNKNOWN;



    @Override

    public void close() {

        IoUtils.closeQuietly(cursor);

        ContentProviderClient.releaseQuietly(client);

        cursor = null;

        client = null;

    }

}



public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> {



    private static final String[] SEARCH_REJECT_MIMES = new String[] { Document.MIME_TYPE_DIR };

packages/DocumentsUI/src/com/android/documentsui/DirectoryResult.java

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.documentsui;



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

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



import android.content.ContentProviderClient;

import android.database.Cursor;



import libcore.io.IoUtils;



public class DirectoryResult implements AutoCloseable {

    ContentProviderClient client;

    public Cursor cursor;

    public Exception exception;



    public int mode = MODE_UNKNOWN;

    public int sortOrder = SORT_ORDER_UNKNOWN;



    @Override

    public void close() {

        IoUtils.closeQuietly(cursor);

        ContentProviderClient.releaseQuietly(client);

        cursor = null;

        client = null;

    }

}

packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.List; 
 * ClipboardManager wrapper class providing higher level logical

 * support for dealing with Documents.

 */

final class DocumentClipper {

public final class DocumentClipper {



    private static final String TAG = "DocumentClipper";

packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java

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


package com.android.documentsui;



import static com.android.documentsui.DirectoryFragment.ANIM_NONE;

import static com.android.documentsui.State.ACTION_CREATE;

import static com.android.documentsui.State.ACTION_GET_CONTENT;

import static com.android.documentsui.State.ACTION_OPEN;

import static com.android.documentsui.State.ACTION_OPEN_COPY_DESTINATION;

import static com.android.documentsui.State.ACTION_OPEN_TREE;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;



import android.app.Activity;

import android.app.Fragment;
@@ -53,6 +53,7 @@ import android.widget.Toolbar; 


import com.android.documentsui.RecentsProvider.RecentColumns;

import com.android.documentsui.RecentsProvider.ResumeColumns;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.model.DocumentInfo;

import com.android.documentsui.model.DurableUtils;

import com.android.documentsui.model.RootInfo;