Remove "Compress To".
Test: Unit tests.
Bug: 35180990
Change-Id: I57d9164e012f842f90e8a8140df6d839261a1432
diff --git a/res/menu/mode_directory.xml b/res/menu/mode_directory.xml
index 798630b..2849e01 100644
--- a/res/menu/mode_directory.xml
+++ b/res/menu/mode_directory.xml
@@ -51,11 +51,6 @@
android:showAsAction="never"
android:visible="false" />
<item
- android:id="@+id/menu_compress_to"
- android:title="@string/menu_compress_to"
- android:showAsAction="never"
- android:visible="false" />
- <item
android:id="@+id/menu_compress"
android:title="@string/menu_compress"
android:showAsAction="never"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dd99c51..dad34c5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,8 +52,6 @@
<string name="menu_copy">Copy to\u2026</string>
<!-- Menu item title that moves the selected documents [CHAR LIMIT=28] -->
<string name="menu_move">Move to\u2026</string>
- <!-- Menu item title that compresses the selected documents to the user selected directory [CHAR LIMIT=28] -->
- <string name="menu_compress_to">Compress to\u2026</string>
<!-- Menu item title that compresses the selected documents to the current directory [CHAR LIMIT=28] -->
<string name="menu_compress">Compress</string>
<!-- Menu item title that extracts the selected documents [CHAR LIMIT=28] -->
diff --git a/src/com/android/documentsui/MenuManager.java b/src/com/android/documentsui/MenuManager.java
index 4a57454..bdc6402 100644
--- a/src/com/android/documentsui/MenuManager.java
+++ b/src/com/android/documentsui/MenuManager.java
@@ -60,7 +60,6 @@
updateSelectAll(menu.findItem(R.id.menu_select_all));
updateMoveTo(menu.findItem(R.id.menu_move_to), selection);
updateCopyTo(menu.findItem(R.id.menu_copy_to), selection);
- updateCompressTo(menu.findItem(R.id.menu_compress_to), selection);
updateCompress(menu.findItem(R.id.menu_compress), selection);
updateExtractTo(menu.findItem(R.id.menu_extract_to), selection);
@@ -272,10 +271,6 @@
copyTo.setVisible(false);
}
- protected void updateCompressTo(MenuItem compressTo, SelectionDetails selectionDetails) {
- compressTo.setVisible(false);
- }
-
protected void updateCompress(MenuItem compress, SelectionDetails selectionDetails) {
compress.setVisible(false);
}
diff --git a/src/com/android/documentsui/Metrics.java b/src/com/android/documentsui/Metrics.java
index d407796..660f1ab 100644
--- a/src/com/android/documentsui/Metrics.java
+++ b/src/com/android/documentsui/Metrics.java
@@ -305,7 +305,7 @@
public static final int USER_ACTION_HIDE_SIZE = 9;
public static final int USER_ACTION_SETTINGS = 10;
public static final int USER_ACTION_COPY_TO = 11;
- public static final int USER_ACTION_COMPRESS_TO = 27;
+ public static final int USER_ACTION_COMPRESS = 27;
public static final int USER_ACTION_EXTRACT_TO = 28;
public static final int USER_ACTION_MOVE_TO = 12;
public static final int USER_ACTION_DELETE = 13;
@@ -335,7 +335,7 @@
USER_ACTION_HIDE_SIZE,
USER_ACTION_SETTINGS,
USER_ACTION_COPY_TO,
- USER_ACTION_COMPRESS_TO,
+ USER_ACTION_COMPRESS,
USER_ACTION_EXTRACT_TO,
USER_ACTION_MOVE_TO,
USER_ACTION_DELETE,
diff --git a/src/com/android/documentsui/dirlist/DirectoryFragment.java b/src/com/android/documentsui/dirlist/DirectoryFragment.java
index bf34785..403a18e 100644
--- a/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -629,13 +629,6 @@
mActionModeController.finishActionMode();
return true;
- case R.id.menu_compress_to:
- transferDocuments(selection, null, FileOperationService.OPERATION_COMPRESS);
- // TODO: Only finish selection mode if compress-to is not canceled.
- // Need to plum down into handling the way we do with deleteDocuments.
- mActionModeController.finishActionMode();
- return true;
-
// TODO: Implement extract (to the current directory).
case R.id.menu_extract_to:
transferDocuments(selection, null, FileOperationService.OPERATION_EXTRACT);
@@ -738,7 +731,7 @@
Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COPY_TO);
break;
case FileOperationService.OPERATION_COMPRESS:
- Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COMPRESS_TO);
+ Metrics.logUserAction(getContext(), Metrics.USER_ACTION_COMPRESS);
break;
case FileOperationService.OPERATION_EXTRACT:
Metrics.logUserAction(getContext(), Metrics.USER_ACTION_EXTRACT_TO);
diff --git a/src/com/android/documentsui/files/MenuManager.java b/src/com/android/documentsui/files/MenuManager.java
index bd28050..9bdacca 100644
--- a/src/com/android/documentsui/files/MenuManager.java
+++ b/src/com/android/documentsui/files/MenuManager.java
@@ -174,22 +174,10 @@
}
@Override
- protected void updateCompressTo(MenuItem compressTo, SelectionDetails selectionDetails) {
- // (1) Do not allow to compress already compressed files for simplicity.
- // (2) Show only if the current directory *is* read-only.
+ protected void updateCompress(MenuItem compress, SelectionDetails selectionDetails) {
final boolean readOnly = !mDirDetails.canCreateDoc();
- compressTo.setVisible(readOnly);
- compressTo.setEnabled(!selectionDetails.containsPartialFiles() &&
- !selectionDetails.canExtract());
- }
-
- @Override
- protected void updateCompress(MenuItem compressTo, SelectionDetails selectionDetails) {
- // (1) Do not allow to compress already compressed files for simplicity.
- // (2) Show only if the current directory *is not* read only.
- final boolean readOnly = !mDirDetails.canCreateDoc();
- compressTo.setVisible(!readOnly);
- compressTo.setEnabled(!selectionDetails.containsPartialFiles() &&
+ compress.setVisible(true);
+ compress.setEnabled(!readOnly && !selectionDetails.containsPartialFiles() &&
!selectionDetails.canExtract());
}
diff --git a/tests/common/com/android/documentsui/testing/TestMenu.java b/tests/common/com/android/documentsui/testing/TestMenu.java
index 9d802aa..b9f0aee 100644
--- a/tests/common/com/android/documentsui/testing/TestMenu.java
+++ b/tests/common/com/android/documentsui/testing/TestMenu.java
@@ -43,7 +43,6 @@
R.id.menu_rename,
R.id.menu_move_to,
R.id.menu_copy_to,
- R.id.menu_compress_to,
R.id.menu_compress,
R.id.menu_extract_to,
R.id.menu_cut_to_clipboard,
diff --git a/tests/unit/com/android/documentsui/files/MenuManagerTest.java b/tests/unit/com/android/documentsui/files/MenuManagerTest.java
index 9a3cf5b..621faf2 100644
--- a/tests/unit/com/android/documentsui/files/MenuManagerTest.java
+++ b/tests/unit/com/android/documentsui/files/MenuManagerTest.java
@@ -49,7 +49,6 @@
private TestMenuItem selectAll;
private TestMenuItem moveTo;
private TestMenuItem copyTo;
- private TestMenuItem compressTo;
private TestMenuItem compress;
private TestMenuItem extractTo;
private TestMenuItem share;
@@ -83,7 +82,6 @@
selectAll = testMenu.findItem(R.id.menu_select_all);
moveTo = testMenu.findItem(R.id.menu_move_to);
copyTo = testMenu.findItem(R.id.menu_copy_to);
- compressTo = testMenu.findItem(R.id.menu_compress_to);
compress = testMenu.findItem(R.id.menu_compress);
extractTo = testMenu.findItem(R.id.menu_extract_to);
share = testMenu.findItem(R.id.menu_share);
@@ -126,7 +124,6 @@
delete.assertVisible();
share.assertVisible();
copyTo.assertEnabled();
- compressTo.assertInvisible();
compress.assertEnabled();
extractTo.assertInvisible();
moveTo.assertEnabled();
@@ -141,28 +138,25 @@
rename.assertDisabled();
share.assertInvisible();
copyTo.assertDisabled();
- compressTo.assertInvisible();
- compress.assertEnabled();
+ compress.assertDisabled();
extractTo.assertDisabled();
moveTo.assertDisabled();
}
@Test
- public void testActionMenu_extract() {
+ public void testActionMenu_compress() {
dirDetails.canCreateDoc = true;
mgr.updateActionMenu(testMenu, selectionDetails);
- compressTo.assertInvisible();
compress.assertEnabled();
}
@Test
- public void testActionMenu_extractTo() {
+ public void testActionMenu_cantCompress() {
dirDetails.canCreateDoc = false;
mgr.updateActionMenu(testMenu, selectionDetails);
- compressTo.assertEnabled();
- compress.assertInvisible();
+ compress.assertDisabled();
}
@Test
@@ -201,31 +195,17 @@
}
@Test
- public void testActionMenu_canExtract_hidesCopyToAndCompressToAndShare() {
+ public void testActionMenu_canExtract_hidesCopyToAndCompressAndShare() {
selectionDetails.canExtract = true;
dirDetails.canCreateDoc = true;
mgr.updateActionMenu(testMenu, selectionDetails);
extractTo.assertEnabled();
copyTo.assertDisabled();
- compressTo.assertInvisible();
compress.assertDisabled();
}
@Test
- public void testActionMenu_canExtract_hidesCopyToAndCompress() {
- selectionDetails.canExtract = true;
- dirDetails.canCreateDoc = false;
- mgr.updateActionMenu(testMenu, selectionDetails);
-
- extractTo.assertEnabled();
- copyTo.assertDisabled();
- compressTo.assertDisabled();
- share.assertInvisible();
- compress.assertInvisible();
- }
-
- @Test
public void testOptionMenu() {
mgr.updateOptionMenu(testMenu);