Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create "Home" dir instead of "home" to match other default dirs."

Browse Source
This commit is contained in:
Steve McKay
2016-02-01 23:00:59 +00:00
committed by Android (Google) Code Review
parent ed553f6b0d 5c462a0e31
commit a7dbccff77
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28536,6 +28536,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;

1
api/system-current.txt
View File

@@ -30563,6 +30563,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;

1
api/test-current.txt
View File

@@ -28545,6 +28545,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;

9
core/java/android/os/Environment.java
View File

@@ -478,6 +478,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>
@@ -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
};
/**

5
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@@ -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 {