Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d9344d5 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Merge "Remove "HOME" directory. Use "Documents" instead." into nyc-dev am: 25a7ee08 

am: 40cc8409

* commit '40cc8409':
  Remove "HOME" directory. Use "Documents" instead.
parents 661f3969 40cc8409

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28579,7 +28579,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;

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -30863,7 +30863,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;

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28588,7 +28588,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;

core/java/android/os/Environment.java

+1 −8
Original line number Diff line number Diff line
@@ -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

    };



    /**

packages/DocumentsUI/res/drawable/ic_root_home.xml→packages/DocumentsUI/res/drawable/ic_root_documents.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>