Merge "Fix crash issue when mouse band selection" (0afcb08c) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/files/MenuManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,8 @@ public final class MenuManager extends com.android.documentsui.MenuManager {

		@Override
		protected void updateViewInOwner(MenuItem view, SelectionDetails selectionDetails) {
		if (selectionDetails.canViewInOwner()) {
		if (selectionDetails.canViewInOwner() &&
		mSelectionManager.getSelection().iterator().hasNext()) {
		view.setVisible(true);
		view.setEnabled(true);
		Resources res = mContext.getResources();

+20 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,26 @@ public final class MenuManagerTest {
		actionModeViewInOwner.assertVisible();
		}

		@Test
		public void testActionsMenu_cantViewInOwner_noSelection() {
		// Simulate empty selection
		selectionManager = SelectionHelpers.createTestInstance();
		mgr = new MenuManager(
		features,
		testSearchManager,
		state,
		dirDetails,
		activity,
		selectionManager,
		this::getApplicationNameFromAuthority,
		this::getUriFromModelId);

		selectionDetails.canViewInOwner = true;
		mgr.updateActionMenu(testMenu, selectionDetails);

		actionModeViewInOwner.assertInvisible();
		}

		@Test
		public void testActionMenu_changeToCanDelete() {
		selectionDetails.canDelete = false;