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

Commit ff210964 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Minor tweaks on Scoped Directory Access:" into nyc-dev 

am: d847b51

* commit 'd847b511d3828fa6cb7a740ecd8876f16524f684':
  Minor tweaks on Scoped Directory Access:

Change-Id: I27a0c909600ec42e6f7570c0cd7b528d1619233f
parents e6accb2d bc03df8a

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ 
    <string name="open_external_dialog_request">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>

        access to <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> directory on

        <xliff:g id="storage" example="SD Card"><i>^3</i></xliff:g>?</string>

    <!-- Text in an alert dialog asking user to grant app access to a given directory in the internal storage -->

    <string name="open_external_dialog_request_primary_volume">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>

        access to <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> directory?</string>

    <!-- Text in an alert dialog asking user to grant app access to all data in an external storage volume -->

    <string name="open_external_dialog_root_request">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>

        access to your data, including photos and videos, on <xliff:g id="storage" example="SD Card"><i>^2</i></xliff:g>?</string>

src/com/android/documentsui/OpenExternalDirectoryActivity.java

+14 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public class OpenExternalDirectoryActivity extends Activity { 
    private static final String EXTRA_VOLUME_LABEL = "com.android.documentsui.VOLUME_LABEL";

    private static final String EXTRA_VOLUME_UUID = "com.android.documentsui.VOLUME_UUID";

    private static final String EXTRA_IS_ROOT = "com.android.documentsui.IS_ROOT";

    private static final String EXTRA_IS_PRIMARY = "com.android.documentsui.IS_PRIMARY";

    // Special directory name representing the full volume

    static final String DIRECTORY_ROOT = "ROOT_DIRECTORY";
@@ -157,6 +158,13 @@ public class OpenExternalDirectoryActivity extends Activity { 
            Log.d(TAG, "showFragment() for volume " + storageVolume.dump() + ", directory "

                    + directoryName + ", and user " + userId);

        final boolean isRoot = directoryName.equals(DIRECTORY_ROOT);

        final boolean isPrimary = storageVolume.isPrimary();



        if (isRoot && isPrimary) {

            if (DEBUG) Log.d(TAG, "root access requested on primary volume");

            return false;

        }



        final File volumeRoot = storageVolume.getPathFile();

        File file;

        try {
@@ -235,6 +243,7 @@ public class OpenExternalDirectoryActivity extends Activity { 
        args.putString(EXTRA_VOLUME_UUID, volumeUuid);

        args.putString(EXTRA_APP_LABEL, appLabel);

        args.putBoolean(EXTRA_IS_ROOT, isRoot);

        args.putBoolean(EXTRA_IS_PRIMARY, isPrimary);



        final FragmentManager fm = activity.getFragmentManager();

        final FragmentTransaction ft = fm.beginTransaction();
@@ -352,6 +361,7 @@ public class OpenExternalDirectoryActivity extends Activity { 
        private String mVolumeLabel;

        private String mAppLabel;

        private boolean mIsRoot;

        private boolean mIsPrimary;

        private CheckBox mDontAskAgain;

        private OpenExternalDirectoryActivity mActivity;

        private AlertDialog mDialog;
@@ -367,6 +377,7 @@ public class OpenExternalDirectoryActivity extends Activity { 
                mVolumeLabel = args.getString(EXTRA_VOLUME_LABEL);

                mAppLabel = args.getString(EXTRA_APP_LABEL);

                mIsRoot = args.getBoolean(EXTRA_IS_ROOT);

                mIsPrimary= args.getBoolean(EXTRA_IS_PRIMARY);

            }

            mActivity = (OpenExternalDirectoryActivity) getActivity();

        }
@@ -435,7 +446,9 @@ public class OpenExternalDirectoryActivity extends Activity { 
                message = TextUtils.expandTemplate(getText(

                        R.string.open_external_dialog_root_request), mAppLabel, mVolumeLabel);

            } else {

                message = TextUtils.expandTemplate(getText(R.string.open_external_dialog_request),

                message = TextUtils.expandTemplate(

                        getText(mIsPrimary ? R.string.open_external_dialog_request_primary_volume

                                : R.string.open_external_dialog_request),

                        mAppLabel, directory, mVolumeLabel);

            }

            final TextView messageField = (TextView) view.findViewById(R.id.message);