diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/Environment.java | 9 | ||||
| -rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 5 |
5 files changed, 15 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 24776c111d0f..e318463ebcec 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28516,6 +28516,7 @@ package android.os { field public static java.lang.String DIRECTORY_DCIM; field public static java.lang.String DIRECTORY_DOCUMENTS; field public static java.lang.String DIRECTORY_DOWNLOADS; + field public static java.lang.String DIRECTORY_HOME; field public static java.lang.String DIRECTORY_MOVIES; field public static java.lang.String DIRECTORY_MUSIC; field public static java.lang.String DIRECTORY_NOTIFICATIONS; diff --git a/api/system-current.txt b/api/system-current.txt index 2ab45cb9e1f1..44825922f357 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30543,6 +30543,7 @@ package android.os { field public static java.lang.String DIRECTORY_DCIM; field public static java.lang.String DIRECTORY_DOCUMENTS; field public static java.lang.String DIRECTORY_DOWNLOADS; + field public static java.lang.String DIRECTORY_HOME; field public static java.lang.String DIRECTORY_MOVIES; field public static java.lang.String DIRECTORY_MUSIC; field public static java.lang.String DIRECTORY_NOTIFICATIONS; diff --git a/api/test-current.txt b/api/test-current.txt index 60274d745387..3f0022471518 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -28525,6 +28525,7 @@ package android.os { field public static java.lang.String DIRECTORY_DCIM; field public static java.lang.String DIRECTORY_DOCUMENTS; field public static java.lang.String DIRECTORY_DOWNLOADS; + field public static java.lang.String DIRECTORY_HOME; field public static java.lang.String DIRECTORY_MOVIES; field public static java.lang.String DIRECTORY_MUSIC; field public static java.lang.String DIRECTORY_NOTIFICATIONS; diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index c776ef82d526..e841dfe2b2a3 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -479,6 +479,11 @@ public class Environment { public static String DIRECTORY_DOCUMENTS = "Documents"; /** + * Standard directory in which user managed files are stored. + */ + public static String DIRECTORY_HOME = "Home"; + + /** * List of standard storage directories. * <p> * Each of its values have its own constant: @@ -493,6 +498,7 @@ public class Environment { * <li>{@link #DIRECTORY_DOWNLOADS} * <li>{@link #DIRECTORY_DCIM} * <li>{@link #DIRECTORY_DOCUMENTS} + * <li>{@link #DIRECTORY_HOME} * </ul> * @hide */ @@ -506,7 +512,8 @@ public class Environment { DIRECTORY_MOVIES, DIRECTORY_DOWNLOADS, DIRECTORY_DCIM, - DIRECTORY_DOCUMENTS + DIRECTORY_DOCUMENTS, + DIRECTORY_HOME }; /** diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 1bfc19c101eb..56e5a9b6c58d 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -27,6 +27,7 @@ import android.graphics.Point; import android.net.Uri; import android.os.Bundle; import android.os.CancellationSignal; +import android.os.Environment; import android.os.FileObserver; import android.os.FileUtils; import android.os.Handler; @@ -208,8 +209,10 @@ public class ExternalStorageProvider extends DocumentsProvider { root.flags |= Root.FLAG_SUPPORTS_CREATE; } + // Create the "Home" directory on disk, but don't the localized root.title + // since the directories shouldn't be localized. root.visiblePath = new File( - primaryVolume.getPathForUser(userId), root.rootId); + primaryVolume.getPathForUser(userId), Environment.DIRECTORY_HOME); root.path = new File( primaryVolume.getInternalPathForUser(userId), root.rootId); try { |