commit ea40813d045ab100d200cc1940e130ef2c3044ce
author Daniel Nishi <dhnishi@google.com> Fri Jan 27 22:57:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 27 22:57:34 2017 +0000
tree 049eb97ac08b99dea937090df8b108197b74009a
parent 8201bcb7109b0753507f2cf1981240da97ebd693
parent 1db848885d875fdc2852aad142f5134014aeb386

Merge "Go to the old storage settings when using non-internal storage."

src/com/android/settings/deviceinfo/StorageSettings.java

diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 53d4c85..b79560a 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -279,8 +279,19 @@
             if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {
                 final Bundle args = new Bundle();
                 args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
-                startFragment(this, StorageDashboardFragment.class.getCanonicalName(),
-                        -1, 0, args);
+
+                if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) {
+                    startFragment(this, StorageDashboardFragment.class.getCanonicalName(),
+                            -1, 0, args);
+                } else {
+                    // TODO: Go to the StorageDashboardFragment once it fully handles all of the
+                    //       SD card cases and other private internal storage cases.
+                    PrivateVolumeSettings.setVolumeSize(args, PrivateStorageInfo.getTotalSize(vol,
+                            sTotalInternalStorage));
+                    startFragment(this, PrivateVolumeSettings.class.getCanonicalName(),
+                            -1, 0, args);
+                }
+
                 return true;
 
             } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {