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

Commit 5c462a0e authored by Steve McKay's avatar Steve McKay
Browse files

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

Add DIRECTORY_HOME to android.os.Environment...use that for dir name,
    so we don't use a localized name when creating directory.
Mark all of the DIRECTORY_* fields final.

Bug: 26814341
Change-Id: I5a11bcb180674c619de2f5ce9ed598521e60cc25
parent f43ec7e5

api/current.txt

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

api/system-current.txt

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

api/test-current.txt

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

core/java/android/os/Environment.java

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

    };



    /**

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

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