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

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

Merge "Update RecentsCreateView to use RecyclerView."

parents 3e7e3aa8 c643386e

packages/DocumentsUI/res/layout/fragment_directory.xml

+0 −6
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ 
        android:visibility="gone"

        style="@android:style/TextAppearance.Material.Subhead" />



    <!-- The 'list' view is still used for RecentsCreateFragment -->

    <ListView

        android:id="@+id/list"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

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

+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ abstract class BaseActivity extends Activity { 
    @LayoutRes

    private int mLayoutId;

    private final String mTag;

    private DirectoryContainerView mDirectoryContainer;



    public abstract void onDocumentPicked(DocumentInfo doc, @Nullable DocumentContext siblings);

    public abstract void onDocumentsPicked(List<DocumentInfo> docs);
@@ -116,6 +117,7 @@ abstract class BaseActivity extends Activity { 
        setContentView(mLayoutId);



        mRoots = DocumentsApplication.getRootsCache(this);

        mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory);

        mSearchManager = new SearchManager();



        // Base classes must update result in their onCreate.
@@ -316,6 +318,7 @@ abstract class BaseActivity extends Activity { 
     * @param anim

     */

    final void onCurrentDirectoryChanged(int anim) {

        mDirectoryContainer.setDrawDisappearingFirst(anim == ANIM_DOWN);

        onDirectoryChanged(anim);



        final RootsFragment roots = RootsFragment.get(getFragmentManager());

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

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ import com.android.documentsui.model.DocumentInfo; 
import com.android.documentsui.model.DocumentStack;

import com.android.documentsui.model.RootInfo;

import com.android.internal.util.Preconditions;



import com.google.common.collect.Lists;



import java.util.ArrayList;

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

+0 −6
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ public class DocumentsActivity extends BaseActivity { 


    private Toolbar mRootsToolbar;



    private DirectoryContainerView mDirectoryContainer;



    private ItemSelectedListener mStackListener;

    private BaseAdapter mStackAdapter;
@@ -114,8 +112,6 @@ public class DocumentsActivity extends BaseActivity { 
            mDrawer = DrawerController.create(this);

        }



        mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory);



        mToolbar = (Toolbar) findViewById(R.id.toolbar);



        mStackAdapter = new StackAdapter();
@@ -407,8 +403,6 @@ public class DocumentsActivity extends BaseActivity { 
        final RootInfo root = getCurrentRoot();

        final DocumentInfo cwd = getCurrentDirectory();



        mDirectoryContainer.setDrawDisappearingFirst(anim == ANIM_DOWN);



        if (cwd == null) {

            // No directory means recents

            if (mState.action == ACTION_CREATE ||

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

+0 −5
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class FilesActivity extends BaseActivity { 


    private Toolbar mToolbar;

    private Spinner mToolbarStack;

    private DirectoryContainerView mDirectoryContainer;

    private ItemSelectedListener mStackListener;

    private BaseAdapter mStackAdapter;

    private DocumentClipper mClipper;
@@ -77,8 +76,6 @@ public class FilesActivity extends BaseActivity { 


        final Context context = this;



        mDirectoryContainer = (DirectoryContainerView) findViewById(R.id.container_directory);



        mToolbar = (Toolbar) findViewById(R.id.toolbar);



        mStackAdapter = new StackAdapter();
@@ -235,8 +232,6 @@ public class FilesActivity extends BaseActivity { 
        final RootInfo root = getCurrentRoot();

        final DocumentInfo cwd = getCurrentDirectory();



        mDirectoryContainer.setDrawDisappearingFirst(anim == ANIM_DOWN);



        if (cwd == null) {

            DirectoryFragment.showRecentsOpen(fm, anim);