Merge "Remove the EXTRA_FANCY_FEATURES flag..."

core/java/android/os/storage/VolumeInfo.java

@@ -442,7 +442,6 @@ public class VolumeInfo implements Parcelable {
         // note that docsui treats this as *force* show advanced. So sending
         // false permits advanced to be shown based on user preferences.
         intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, isPrimary());
-        intent.putExtra(DocumentsContract.EXTRA_FANCY_FEATURES, true);
         return intent;
     }
 

core/java/android/provider/DocumentsContract.java

@@ -102,9 +102,6 @@ public final class DocumentsContract {
     /** {@hide} */
     public static final String EXTRA_SHOW_ADVANCED = "android.content.extra.SHOW_ADVANCED";
 
-    /** {@hide} */
-    public static final String EXTRA_FANCY_FEATURES = "android.content.extra.FANCY";
-
     /** {@hide} */
     public static final String EXTRA_TARGET_URI = "android.content.extra.TARGET_URI";
 

packages/MtpDocumentsProvider/src/com/android/mtp/ReceiverActivity.java

@@ -49,7 +49,6 @@ public class ReceiverActivity extends Activity {
                 final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);
                 intent.setData(uri);
                 intent.addCategory(Intent.CATEGORY_DEFAULT);
-                intent.putExtra(DocumentsContract.EXTRA_FANCY_FEATURES, true);
                 this.startActivity(intent);
             } catch (IOException exception) {
                 Log.e(MtpDocumentsProvider.TAG, "Failed to open device", exception);