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

Commit fdbab1ae authored by Tony Huang's avatar Tony Huang
Browse files

Disable getinfo in recent 

Recent should disable getinfo menu because its document info is
empty.

Fix: 130194567
Test: manual
Test: atest DocumentsGoogleUITests
Change-Id: I555e11094ca83cdcd3e262eff39e32485be03763
parent 75671357

src/com/android/documentsui/AbstractActionHandler.java

+4 −0
Original line number Diff line number Diff line
@@ -660,6 +660,10 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA 
        void onDocumentPicked(DocumentInfo doc);

        RootInfo getCurrentRoot();

        DocumentInfo getCurrentDirectory();

        /**

         * Check whether current directory is root of recent.

         */

        boolean isInRecents();

        void setRootsDrawerOpen(boolean open);



        // TODO: Let navigator listens to State

src/com/android/documentsui/BaseActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -731,6 +731,11 @@ public abstract class BaseActivity 
        return mState.stack.peek();

    }



    @Override

    public boolean isInRecents() {

        return mState.stack.isRecents();

    }



    @VisibleForTesting

    public void addEventListener(EventListener listener) {

        mEventListeners.add(listener);

src/com/android/documentsui/MenuManager.java

+5 −5
Original line number Diff line number Diff line
@@ -22,16 +22,16 @@ import android.view.MenuInflater; 
import android.view.MenuItem;

import android.view.View;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;



import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.EventListener;

import com.android.documentsui.base.Menus;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.State;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.queries.SearchViewManager;

import com.android.documentsui.sidebar.RootsFragment;

import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;



import java.util.List;

import java.util.function.IntFunction;
@@ -401,7 +401,7 @@ public abstract class MenuManager { 
        }



        public boolean isInRecents() {

            return mActivity.getCurrentDirectory() == null;

            return mActivity.isInRecents();

        }



        public boolean canCreateDirectory() {
@@ -409,7 +409,7 @@ public abstract class MenuManager { 
        }



        public boolean canInspectDirectory() {

            return mActivity.canInspectDirectory();

            return mActivity.canInspectDirectory() && !isInRecents();

        }

    }

}