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

Commit 567fdd9f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "When launched into empty recents, show drawer." into klp-dev

parents ad45fa64 a82c2e24

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

+5 −0
Original line number Diff line number Diff line
@@ -295,6 +295,11 @@ public class DirectoryFragment extends Fragment { 


                updateDisplayState();



                // When launched into empty recents, show drawer

                if (mType == TYPE_RECENT_OPEN && mAdapter.isEmpty() && !state.stackTouched) {

                    ((DocumentsActivity) context).setRootsDrawerOpen(true);

                }



                // Restore any previous instance state

                final SparseArray<Parcelable> container = state.dirState.remove(mStateKey);

                if (container != null && !getArguments().getBoolean(EXTRA_IGNORE_STATE, false)) {

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

+5 −0
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ public class RecentsCreateFragment extends Fragment { 
            public void onLoadFinished(

                    Loader<List<DocumentStack>> loader, List<DocumentStack> data) {

                mAdapter.swapStacks(data);



                // When launched into empty recents, show drawer

                if (mAdapter.isEmpty() && !state.stackTouched) {

                    ((DocumentsActivity) context).setRootsDrawerOpen(true);

                }

            }



            @Override

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

+6 −3
Original line number Diff line number Diff line
@@ -142,12 +142,15 @@ public class RootsFragment extends Fragment { 
        final RootInfo root = ((DocumentsActivity) getActivity()).getCurrentRoot();

        for (int i = 0; i < mAdapter.getCount(); i++) {

            final Object item = mAdapter.getItem(i);

            if (Objects.equal(item, root)) {

            if (item instanceof RootItem) {

                final RootInfo testRoot = ((RootItem) item).root;

                if (Objects.equal(testRoot, root)) {

                    mList.setItemChecked(i, true);

                    return;

                }

            }

        }

    }



    private OnItemClickListener mItemListener = new OnItemClickListener() {

        @Override