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

Commit b636a428 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Checkpoint of new storage wizards."

parents f24037da 94635995

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ LOCAL_PRIVILEGED_MODULE := true 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags



include frameworks/opt/setupwizard/navigationbar/common.mk

include frameworks/opt/setupwizard/library/common.mk

include frameworks/base/packages/SettingsLib/common.mk



include $(BUILD_PACKAGE)

AndroidManifest.xml

+31 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,37 @@ 
                android:resource="@id/storage_settings" />

        </activity>



        <!-- Exported for SystemUI to launch into -->

        <activity android:name=".deviceinfo.StorageWizardInit"

                android:theme="@style/SuwThemeMaterial.Light"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="true" />

        <activity android:name=".deviceinfo.StorageWizardFormatConfirm"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="false" />

        <activity android:name=".deviceinfo.StorageWizardFormatProgress"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="false" />

        <activity android:name=".deviceinfo.StorageWizardMigrate"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="false" />

        <activity android:name=".deviceinfo.StorageWizardMigrateConfirm"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="false" />

        <activity android:name=".deviceinfo.StorageWizardMigrateProgress"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="false" />

        <activity android:name=".deviceinfo.StorageWizardReady"

                android:taskAffinity="com.android.settings.storage_wizard"

                android:exported="false" />



        <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" />



        <activity android:name="ApnEditor"

                android:label="@string/apn_edit">

            <intent-filter>

res/drawable-hdpi/illustration_horizontal.jpg

0 → 100644
+3.94 KiB
Loading image diff...

res/drawable-hdpi/illustration_tile.jpg

0 → 100644
+8.66 KiB
Loading image diff...

res/drawable-mdpi/illustration_horizontal.jpg

0 → 100644
+2.73 KiB
Loading image diff...