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

Commit f9b78bb6 authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Fix focus issues in directory fragment * Empty directory view gets... 

Merge "Fix focus issues in directory fragment     * Empty directory view gets focus when shown     * Skip opening drawer when showing empty search results     * Fix typo" into nyc-dev
parents b3f9ee0d d4b17531

packages/DocumentsUI/res/layout/fragment_directory.xml

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical"

        android:background="@color/window_background"

        android:focusable="true"

        android:focusableInTouchMode="true"

        android:visibility="gone">



        <LinearLayout

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class State implements android.os.Parcelable { 
        return mStackTouched;

    }



    public boolean initialiLocationHasChanged() {

    public boolean initialLocationHasChanged() {

        return mInitialRootChanged || mInitialDocChanged;

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -889,12 +889,14 @@ public class DirectoryFragment extends Fragment implements DocumentsAdapter.Envi 
        imageView.setImageResource(drawable);



        mEmptyView.setVisibility(View.VISIBLE);

        mEmptyView.requestFocus();

        mRecView.setVisibility(View.GONE);

    }



    private void showDirectory() {

        mEmptyView.setVisibility(View.GONE);

        mRecView.setVisibility(View.VISIBLE);

        mRecView.requestFocus();

    }



    private String findCommonMimeType(List<String> mimeTypes) {

packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java

+3 −2
Original line number Diff line number Diff line
@@ -249,9 +249,10 @@ public abstract class FragmentTuner { 


        @Override

        void onModelLoaded(Model model, @ResultType int resultType) {

            if (DEBUG) Log.d(TAG, "Handling model loaded. Has Location shcnage: " + mState.initialiLocationHasChanged());

            if (DEBUG) Log.d(TAG, "Handling model loaded. Has Location shcnage: " + mState.initialLocationHasChanged());

            // When launched into empty root, open drawer.

            if (model.isEmpty() && !mState.initialiLocationHasChanged()) {

            if (model.isEmpty() && !mState.initialLocationHasChanged()

                    && resultType != DirectoryFragment.TYPE_SEARCH) {

                if (DEBUG) Log.d(TAG, "Showing roots drawer cuz stuffs empty.");



                // This noops on layouts without drawer, so no need to guard.