diff options
| author | Steve McKay <smckay@google.com> | 2016-03-01 15:41:47 -0800 |
|---|---|---|
| committer | Steve McKay <smckay@google.com> | 2016-03-02 10:47:59 -0800 |
| commit | 7c4395804e450533afb553ab992c47f737da8a9b (patch) | |
| tree | fc4a3084df2b55aaad526e03c9fc9d6e57b02caf /core/java | |
| parent | ab37f0f8325658aadf9170571c738914d3f8d674 (diff) | |
Always show intern storage.
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".
Bug: 27297398
Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/storage/VolumeInfo.java | 4 | ||||
| -rw-r--r-- | core/java/android/provider/DocumentsContract.java | 14 |
2 files changed, 1 insertions, 17 deletions
diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 4b706496db20..ea0597d8c68c 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -438,10 +438,6 @@ public class VolumeInfo implements Parcelable { final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE); intent.addCategory(Intent.CATEGORY_DEFAULT); intent.setData(uri); - - // 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_SHOW_FILESIZE, true); return intent; } diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 370009893286..3788c746826d 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -93,9 +93,6 @@ public final class DocumentsContract { public static final String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME"; /** {@hide} */ - public static final String EXTRA_SHOW_ADVANCED = "android.content.extra.SHOW_ADVANCED"; - - /** {@hide} */ public static final String EXTRA_SHOW_FILESIZE = "android.content.extra.SHOW_FILESIZE"; /** {@hide} */ @@ -564,22 +561,13 @@ public final class DocumentsContract { public static final int FLAG_EMPTY = 1 << 16; /** - * Flag indicating that this root should only be visible to advanced - * users. - * - * @see #COLUMN_FLAGS - * @hide - */ - public static final int FLAG_ADVANCED = 1 << 17; - - /** * Flag indicating that this root has settings. * * @see #COLUMN_FLAGS * @see DocumentsContract#ACTION_DOCUMENT_ROOT_SETTINGS * @hide */ - public static final int FLAG_HAS_SETTINGS = 1 << 18; + public static final int FLAG_HAS_SETTINGS = 1 << 17; } /** |