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

Commit e77f0687 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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
parent a03f330a

AndroidManifest.xml

+18 −7
Original line number Diff line number Diff line
@@ -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"

res/menu/storage_volume.xml

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
    <item

        android:id="@+id/storage_format"

        android:title="@string/storage_menu_format" />

    <item

        android:id="@+id/storage_migrate"

        android:title="@string/storage_menu_migrate" />

    <item

        android:id="@+id/storage_usb"

        android:title="@string/storage_menu_usb" />

res/values/strings.xml

+5 −3
Original line number Diff line number Diff line
@@ -2285,10 +2285,12 @@ 
    <string name="storage_menu_format">Erase &amp; format</string>

    <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->

    <string name="storage_menu_format_internal">Erase &amp; format as internal storage</string>

    <!-- Storage setting.  Menu option for USB transfer settings [CHAR LIMIT=30]-->

    <string name="storage_menu_usb">USB computer connection</string>

    <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->

    <string name="storage_menu_migrate">Migrate data</string>

    <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->

    <string name="storage_menu_forget">Forget</string>

    <!-- Storage setting.  Menu option for USB transfer settings [CHAR LIMIT=30]-->

    <string name="storage_menu_usb">USB computer connection</string>



    <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->

    <string name="storage_title_usb">USB computer connection</string>
@@ -2402,7 +2404,7 @@ 
    <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->

    <string name="storage_wizard_migrate_confirm_title">Move data now</string>

    <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->

    <string name="storage_wizard_migrate_confirm_body"><b>The move takes about <xliff:g id="time" example="1 hour">^1</xliff:g>. It will free <xliff:g id="size" example="1.2 GB">^2</xliff:g> of internal storage.</b></string>

    <string name="storage_wizard_migrate_confirm_body"><b>The move takes about <xliff:g id="time" example="1 hour">^1</xliff:g>. It will free <xliff:g id="size" example="1.2 GB">^2</xliff:g> on <xliff:g id="name" example="Internal storage">^3</xliff:g>.</b></string>

    <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->

    <string name="storage_wizard_migrate_confirm_next">Move</string>

src/com/android/settings/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ public class Settings extends SettingsActivity { 
    public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class StorageSettingsActivity extends SettingsActivity { /* empty */ }

    public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class PrivateVolumeForgetActivity extends SettingsActivity { /* empty */ }

    public static class PrivateVolumeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }

    public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import com.android.settings.dashboard.DashboardTile; 
import com.android.settings.dashboard.NoHomeDialogFragment;

import com.android.settings.dashboard.SearchResultsSummary;

import com.android.settings.deviceinfo.PrivateVolumeForget;

import com.android.settings.deviceinfo.PrivateVolumeSettings;

import com.android.settings.deviceinfo.PublicVolumeSettings;

import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.deviceinfo.UsbSettings;
@@ -310,8 +311,9 @@ public class SettingsActivity extends Activity 
            com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.class.getName(),

            TextToSpeechSettings.class.getName(),

            StorageSettings.class.getName(),

            PublicVolumeSettings.class.getName(),

            PrivateVolumeForget.class.getName(),

            PrivateVolumeSettings.class.getName(),

            PublicVolumeSettings.class.getName(),

            DevelopmentSettings.class.getName(),

            UsbSettings.class.getName(),

            AndroidBeam.class.getName(),