commit e77f0687dd424ccfdc2b1061221c6c8ba4d6ac8d
author Jeff Sharkey <jsharkey@android.com> Wed Apr 29 11:24:57 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Apr 29 17:24:12 2015 -0700
tree b26b32cfc5b8e5ea2a59549f965be9899e95d85d
parent a03f330af31714e44f67ca09cad66f91a8acbdd2

Returning to wizard, enable migration.

Bring primary storage migration back into the adoption flow, and
provide a path for long-lived notifications to re-launch into the
Settings app.  Also provide option to initiate migration if skipped
during wizard.  For now, estmiate migration size and time based on
a Class 10 card.

Follow other callback refactoring.

Bug: 19993667
Change-Id: Ia0c28eb114bc6c8066c17b3142ed74f962140c91

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0446178..866eaaa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1489,8 +1489,17 @@
                 android:value="true" />
         </activity>
 
-        <activity
-                android:name="Settings$PublicVolumeSettingsActivity"
+        <activity android:name="Settings$PrivateVolumeSettingsActivity"
+                android:label="@string/storage_settings_title"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$StorageSettingsActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/storage_settings" />
+        </activity>
+
+        <activity android:name="Settings$PublicVolumeSettingsActivity"
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$StorageSettingsActivity">
@@ -1508,8 +1517,7 @@
                 android:resource="@id/storage_settings" />
         </activity>
 
-        <activity
-                android:name="Settings$PrivateVolumeForgetActivity"
+        <activity android:name="Settings$PrivateVolumeForgetActivity"
                 android:label="@string/storage_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$StorageSettingsActivity"
@@ -1541,17 +1549,20 @@
                 android:exported="false" />
         <activity android:name=".deviceinfo.StorageWizardMigrateProgress"
                 android:taskAffinity="com.android.settings.storage_wizard"
-                android:exported="false" />
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
         <activity android:name=".deviceinfo.StorageWizardReady"
                 android:taskAffinity="com.android.settings.storage_wizard"
-                android:exported="false" />
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
         <activity android:name=".deviceinfo.StorageWizardMoveConfirm"
                 android:taskAffinity="com.android.settings.storage_wizard"
                 android:exported="false" />
         <activity android:name=".deviceinfo.StorageWizardMoveProgress"
                 android:taskAffinity="com.android.settings.storage_wizard"
-                android:exported="false" />
+                android:exported="true"
+                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
         <!-- Exported for SystemUI to trigger -->
         <receiver android:name=".deviceinfo.StorageUnmountReceiver"