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

Merge "Remove "HOME" directory. Use "Documents" instead." into nyc-dev

Browse Source 
am: 25a7ee08f6

* commit '25a7ee08f6eaa1c0e9e2b2a0ef9b6fe8ecf5da23':
  Remove "HOME" directory. Use "Documents" instead.
This commit is contained in:
Steve McKay
2016-02-17 17:54:09 +00:00
committed by android-build-merger
parent 3d3b3481fe 25a7ee08f6
commit 40cc8409e1
8 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

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

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

@@ -475,11 +475,6 @@ 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>
@@ -495,7 +490,6 @@ public class Environment {
* <li>{@link #DIRECTORY_DOWNLOADS}
* <li>{@link #DIRECTORY_DCIM}
* <li>{@link #DIRECTORY_DOCUMENTS}
* <li>{@link #DIRECTORY_HOME}
* </ul>
* @hide
*/
@@ -509,8 +503,7 @@ public class Environment {
DIRECTORY_MOVIES,
DIRECTORY_DOWNLOADS,
DIRECTORY_DCIM,
DIRECTORY_DOCUMENTS,
DIRECTORY_HOME
DIRECTORY_DOCUMENTS
};
/**

2
packages/DocumentsUI/res/drawable/ic_root_home.xml → packages/DocumentsUI/res/drawable/ic_root_documents.xml
View File

@@ -20,5 +20,5 @@ Copyright (C) 2015 The Android Open Source Project
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/>
android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>
</vector>

2
packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
View File

@@ -171,7 +171,7 @@ public class RootInfo implements Durable, Parcelable {
// TODO: remove these special case icons
if (isHome()) {
derivedIcon = R.drawable.ic_root_home;
derivedIcon = R.drawable.ic_root_documents;
derivedType = TYPE_LOCAL;
} else if (isExternalStorage()) {
derivedIcon = R.drawable.ic_root_smartphone;

4
packages/ExternalStorageProvider/res/values/strings.xml
View File

@@ -20,6 +20,6 @@
<!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
<string name="root_internal_storage">Internal storage</string>
<!-- Title for user home dir. [CHAR LIMIT=24] -->
<string name="root_home">Home</string>
<!-- Title for directory in which a user may store their own documents and files. [CHAR LIMIT=24] -->
<string name="root_documents">Documents</string>
</resources>

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

@@ -199,7 +199,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
final RootInfo root = new RootInfo();
root.rootId = ROOT_ID_HOME;
mRoots.put(root.rootId, root);
root.title = getContext().getString(R.string.root_home);
root.title = getContext().getString(R.string.root_documents);
// Only report bytes on *volumes*...as a matter of policy.
root.reportAvailableBytes = false;
@@ -214,9 +214,9 @@ public class ExternalStorageProvider extends DocumentsProvider {
// 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), Environment.DIRECTORY_HOME);
primaryVolume.getPathForUser(userId), Environment.DIRECTORY_DOCUMENTS);
root.path = new File(
primaryVolume.getInternalPathForUser(userId), root.rootId);
primaryVolume.getInternalPathForUser(userId), Environment.DIRECTORY_DOCUMENTS);
try {
root.docId = getDocIdForFile(root.path);
} catch (FileNotFoundException e) {