Merge "Show ROOT directory on Scoped Directory Access Sample." into pi-dev

2 files changed, 16 insertions, 1 deletions

diff --git a/content/documentsUi/ScopedDirectoryAccess/Application/src/main/java/com/example/android/scopeddirectoryaccess/ScopedDirectoryAccessFragment.java b/content/documentsUi/ScopedDirectoryAccess/Application/src/main/java/com/example/android/scopeddirectoryaccess/ScopedDirectoryAccessFragment.java
index 7f8a73b9..c19577c2 100644
--- a/content/documentsUi/ScopedDirectoryAccess/Application/src/main/java/com/example/android/scopeddirectoryaccess/ScopedDirectoryAccessFragment.java
+++ b/content/documentsUi/ScopedDirectoryAccess/Application/src/main/java/com/example/android/scopeddirectoryaccess/ScopedDirectoryAccessFragment.java
@@ -31,6 +31,7 @@ import android.provider.DocumentsContract;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,6 +40,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +50,8 @@ import java.util.List;
  */
 public class ScopedDirectoryAccessFragment extends Fragment {
 
+    private static final String TAG = "ScopedDirectorySample";
+
     private static final String DIRECTORY_ENTRIES_KEY = "directory_entries";
     private static final String SELECTED_DIRECTORY_KEY = "selected_directory";
     private static final int OPEN_DIRECTORY_REQUEST_CODE = 1;
@@ -134,6 +138,12 @@ public class ScopedDirectoryAccessFragment extends Fragment {
             public void onClick(View view) {
                 String selected = mDirectoriesSpinner.getSelectedItem().toString();
                 String directoryName = getDirectoryName(selected);
+                Log.d(TAG, "Primary: selected=" + selected + " dir=" + directoryName);
+                if (directoryName == null) {
+                    Toast.makeText(getContext(), "Cannot select ROOT on primary directory",
+                            Toast.LENGTH_LONG).show();
+                    return;
+                }
                 StorageVolume storageVolume = mStorageManager.getPrimaryStorageVolume();
                 Intent intent = storageVolume.createAccessIntent(directoryName);
                 startActivityForResult(intent, OPEN_DIRECTORY_REQUEST_CODE);
@@ -156,7 +166,7 @@ public class ScopedDirectoryAccessFragment extends Fragment {
             }
             LinearLayout volumeArea = (LinearLayout) mActivity.getLayoutInflater()
                     .inflate(R.layout.volume_entry, containerVolumes);
-            TextView volumeName = (TextView) volumeArea.findViewById(R.id.textview_volume_name);
+            final TextView volumeName = volumeArea.findViewById(R.id.textview_volume_name);
             volumeName.setText(volumeDescription);
             Button button = (Button) volumeArea.findViewById(R.id.button_open_directory);
             button.setOnClickListener(new View.OnClickListener() {
@@ -164,6 +174,8 @@ public class ScopedDirectoryAccessFragment extends Fragment {
                 public void onClick(View view) {
                     String selected = mDirectoriesSpinner.getSelectedItem().toString();
                     String directoryName = getDirectoryName(selected);
+                    Log.d(TAG, "Secondary: volume=" + volumeName.getText() + ", selected=" + selected
+                            + ", dir=" + directoryName);
                     Intent intent = volume.createAccessIntent(directoryName);
                     startActivityForResult(intent, OPEN_DIRECTORY_REQUEST_CODE);
                 }
@@ -238,6 +250,8 @@ public class ScopedDirectoryAccessFragment extends Fragment {
 
     private String getDirectoryName(String name) {
         switch (name) {
+            case "ROOT":
+                return null;
             case "ALARMS":
                 return Environment.DIRECTORY_ALARMS;
             case "DCIM":
diff --git a/content/documentsUi/ScopedDirectoryAccess/Application/src/main/res/values/strings.xml b/content/documentsUi/ScopedDirectoryAccess/Application/src/main/res/values/strings.xml
index f3a56571..9798da98 100644
--- a/content/documentsUi/ScopedDirectoryAccess/Application/src/main/res/values/strings.xml
+++ b/content/documentsUi/ScopedDirectoryAccess/Application/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="launch">Launch</string>
     <string name="directory_access_settings">Directory access settings</string>
     <string-array name="directories">
+        <item>ROOT</item>
         <item>ALARMS</item>
         <item>DCIM</item>
         <item>DOCUMENTS</item>