summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2015-04-19 04:35:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-04-19 04:35:39 +0000
commit4cfb3130a4b057baba53926d6bb656aa8e9ef1d3 (patch)
tree84cfdbe4b3a620eba7a9fe9b16d3b12837d32b78
parentf47c6488ea7de6bf2938ffb5bb1549bcf948da49 (diff)
parentd58d954a15fb75d99803a35cda02b661bb6697b5 (diff)
Merge "Enable the copy feature."
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index e2e98077e052..a617bd3d6ca5 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -53,7 +53,6 @@ import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.OperationCanceledException;
import android.os.Parcelable;
-import android.os.SystemProperties;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
import android.text.format.DateUtils;
@@ -506,10 +505,7 @@ public class DirectoryFragment extends Fragment {
open.setVisible(!manageOrBrowse);
share.setVisible(manageOrBrowse);
delete.setVisible(manageOrBrowse);
-
- // TODO: unhide copying when ready
- copy.setVisible(manageOrBrowse &&
- SystemProperties.getBoolean("debug.documentsui.enable_copy", false));
+ copy.setVisible(manageOrBrowse);
return true;
}