From ab3b8936dc1f4a24cffea422baf9ef51f0de05e7 Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Tue, 16 Feb 2016 11:37:03 -0800 Subject: [PATCH] Remove "HOME" directory. Use "Documents" instead. Use "Folder" as home icon for now. Bug:27148009 Change-Id: I9f57bba1c8e51ae7887861923f5baa8f69ec2e6e --- api/current.txt | 1 - api/system-current.txt | 1 - api/test-current.txt | 1 - core/java/android/os/Environment.java | 9 +-------- .../drawable/{ic_root_home.xml => ic_root_documents.xml} | 2 +- .../src/com/android/documentsui/model/RootInfo.java | 2 +- packages/ExternalStorageProvider/res/values/strings.xml | 4 ++-- .../android/externalstorage/ExternalStorageProvider.java | 6 +++--- 8 files changed, 8 insertions(+), 18 deletions(-) rename packages/DocumentsUI/res/drawable/{ic_root_home.xml => ic_root_documents.xml} (87%) diff --git a/api/current.txt b/api/current.txt index 7fdd5db96f765..c09373eef6929 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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; diff --git a/api/system-current.txt b/api/system-current.txt index 266900f917e97..8ce6616dbcf0b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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; diff --git a/api/test-current.txt b/api/test-current.txt index e940378f12ca0..f90b921335666 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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; diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 59bf2938cfcec..70f9cc57faf85 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -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. *

@@ -495,7 +490,6 @@ public class Environment { *

  • {@link #DIRECTORY_DOWNLOADS} *
  • {@link #DIRECTORY_DCIM} *
  • {@link #DIRECTORY_DOCUMENTS} - *
  • {@link #DIRECTORY_HOME} * * @hide */ @@ -509,8 +503,7 @@ public class Environment { DIRECTORY_MOVIES, DIRECTORY_DOWNLOADS, DIRECTORY_DCIM, - DIRECTORY_DOCUMENTS, - DIRECTORY_HOME + DIRECTORY_DOCUMENTS }; /** diff --git a/packages/DocumentsUI/res/drawable/ic_root_home.xml b/packages/DocumentsUI/res/drawable/ic_root_documents.xml similarity index 87% rename from packages/DocumentsUI/res/drawable/ic_root_home.xml rename to packages/DocumentsUI/res/drawable/ic_root_documents.xml index 696ee0534b634..afd886d2adc50 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_home.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_documents.xml @@ -20,5 +20,5 @@ Copyright (C) 2015 The Android Open Source Project android:viewportHeight="24.0"> + 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"/> diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index 3f14a5506adf0..ffa8f596af65b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -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; diff --git a/packages/ExternalStorageProvider/res/values/strings.xml b/packages/ExternalStorageProvider/res/values/strings.xml index e48436ecb8ba7..8b16d3c3b9d4a 100644 --- a/packages/ExternalStorageProvider/res/values/strings.xml +++ b/packages/ExternalStorageProvider/res/values/strings.xml @@ -20,6 +20,6 @@ Internal storage - - Home + + Documents diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index f89934dc50e43..97dfd47aea9f4 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -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) {