commit a0b52655668ccbe3f12ca13ced4b34118a483783
author Steve McKay <smckay@google.com> Thu Oct 27 12:56:55 2016 -0700
committer Steve McKay <smckay@google.com> Thu Oct 27 13:49:10 2016 -0700
tree 613c2edd88872c8f25289df9f1194fab825f6eca
parent 8e6eaf7ace753cd4e77cdde1b300e142e33d9c28

Rechristen Downloads > Files.

Enable productivity mode by default.
  - New window support.
  - Documents root is shown and is home dir.
Use the Files icon, instead of downloads.
Cleanup Shared.foo settings logic a bit.
Eliminate use of ENABLE_PRODUCTIVITY_MODE (but don't remove just yet).

This will let folks like Ronald Ho test from master.

Change-Id: I038828ac398ec0625db033aa576b6951ea450736

src/com/android/documentsui/base/Shared.java

diff --git a/src/com/android/documentsui/base/Shared.java b/src/com/android/documentsui/base/Shared.java
index c580cee..d8374a0 100644
--- a/src/com/android/documentsui/base/Shared.java
+++ b/src/com/android/documentsui/base/Shared.java
@@ -55,13 +55,6 @@
             "com.android.documentsui.PICK_COPY_DESTINATION";
 
     /**
-     * Extra flag allowing app to be opened in productivity mode (less downloadsy).
-     * Useful developers and the likes. When set to true overrides the default
-     * config value of productivity_device.
-     */
-    public static final String EXTRA_PRODUCTIVITY_MODE = "com.android.documentsui.PRODUCTIVITY";
-
-    /**
      * Extra boolean flag for {@link #ACTION_PICK_COPY_DESTINATION}, which
      * specifies if the destination directory needs to create new directory or not.
      */
@@ -221,7 +214,7 @@
      * Method can be overridden if the change of the behavior of the the child activity is needed.
      */
     public static Uri getDefaultRootUri(Activity activity) {
-        return shouldShowDocumentsRoot(activity, activity.getIntent())
+        return shouldShowDocumentsRoot(activity)
                 ? DocumentsContract.buildHomeUri()
                 : DocumentsContract.buildRootUri(
                         "com.android.providers.downloads.documents", "downloads");
@@ -240,17 +233,15 @@
     /*
      * Returns true if app is running in "productivity mode".
      */
-    private static boolean isProductivityMode(Context context, Intent intent) {
-        return intent.getBooleanExtra(
-                Shared.EXTRA_PRODUCTIVITY_MODE,
-                context.getResources().getBoolean(R.bool.productivity_device));
+    public static boolean isProductivityMode(Context context) {
+        return context.getResources().getBoolean(R.bool.productivity_device);
     }
 
     /*
      * Returns true if "Documents" root should be shown.
      */
-    public static boolean shouldShowDocumentsRoot(Context context, Intent intent) {
-        return isProductivityMode(context, intent);
+    public static boolean shouldShowDocumentsRoot(Context context) {
+        return isProductivityMode(context);
     }
 
     /*
@@ -261,15 +252,6 @@
         return intent.getBooleanExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, false);
     }
 
-    /**
-     * Returns true if device root should be shown.
-     */
-    public static boolean shouldShowFancyFeatures(Activity activity) {
-        Intent intent = activity.getIntent();
-        return isProductivityMode(activity, intent)
-                || intent.getBooleanExtra(DocumentsContract.EXTRA_FANCY_FEATURES, false);
-    }
-
     public static void checkMainLoop() {
         if (Looper.getMainLooper() != Looper.myLooper()) {
             Log.e(TAG, "Calling from non-UI thread!");