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

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

Merge "Update storage wizard to latest UX mocks." into pi-dev

parents b410c21a 2af67a93

AndroidManifest.xml

+9 −13
Original line number Diff line number Diff line
@@ -1842,43 +1842,39 @@ 


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

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="true"

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

                android:exported="false" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="false" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

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

                android:exported="false" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="false" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="true"

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="true"

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />



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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="false" />

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

                android:theme="@style/SetupWizardStorageStyle"

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

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

                android:exported="true"

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

res/drawable/ic_apps_alt.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"

        android:fillColor="#000000"/>

</vector>

res/drawable/ic_battery_charging_full.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2018 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4zM11,20v-5.5H9L13,7v5.5h2L11,20z"

        android:fillColor="#000000"/>

</vector>

res/drawable/ic_sd_card.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2018 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"

        android:fillColor="#000000"/>

</vector>

res/drawable/ic_storage_wizard_external.xml

0 → 100644
+89 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2018 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="144dp"

        android:height="144dp"

        android:viewportWidth="144.0"

        android:viewportHeight="144.0">

    <path

        android:pathData="M20.98,105C19.88,105 19,104.12 19,103.03L19,44.97C19,43.88 19.88,43 20.98,43L49.02,43C50.12,43 51,43.88 51,44.97L51,103.03C51,104.12 50.12,105 49.02,105L20.98,105Z"

        android:strokeColor="#00000000"

        android:fillType="evenOdd"

        android:fillColor="#FFFFFF"

        android:strokeWidth="1"/>

    <path

        android:pathData="M20.98,106C19.33,106 18,104.68 18,103.03L18,44.97C18,43.32 19.33,42 20.98,42L49.02,42C50.67,42 52,43.32 52,44.97L52,103.03C52,104.68 50.67,106 49.02,106L20.98,106Z"

        android:fillType="nonZero"

        android:strokeColor="#DADCE0"

        android:fillColor="#00000000"

        android:strokeWidth="2"/>

    <path

        android:pathData="M20.98,104L49.02,104C49.57,104 50,103.57 50,103.03L50,44.97C50,44.43 49.57,44 49.02,44L20.98,44C20.43,44 20,44.43 20,44.97L20,103.03C20,103.57 20.43,104 20.98,104Z"

        android:fillType="nonZero"

        android:strokeColor="#F1F3F4"

        android:fillColor="#00000000"

        android:strokeWidth="2"/>

    <path

        android:pathData="M79,97L159,97A1,1 0,0 1,160 98L160,106A1,1 0,0 1,159 107L79,107A1,1 0,0 1,78 106L78,98A1,1 0,0 1,79 97z"

        android:strokeColor="#00000000"

        android:fillType="evenOdd"

        android:fillColor="#F1F3F4"

        android:strokeWidth="1"/>

    <path

        android:pathData="M80,98L158,98A1,1 0,0 1,159 99L159,105A1,1 0,0 1,158 106L80,106A1,1 0,0 1,79 105L79,99A1,1 0,0 1,80 98z"

        android:fillType="evenOdd"

        android:strokeColor="#DADCE0"

        android:fillColor="#00000000"

        android:strokeWidth="2"/>

    <path

        android:pathData="M95,37L173,37C174.1,37 175,37.9 175,39L175,97C175,98.1 174.1,99 173,99L93,99L93,39C93,37.9 93.9,37 95,37Z"

        android:strokeColor="#00000000"

        android:fillType="evenOdd"

        android:fillColor="#F1F3F4"

        android:strokeWidth="1"/>

    <path

        android:pathData="M94,98L173,98C173.55,98 174,97.55 174,97L174,39C174,38.45 173.55,38 173,38L95,38C94.45,38 94,38.45 94,39L94,98Z"

        android:fillType="evenOdd"

        android:strokeColor="#DADCE0"

        android:fillColor="#00000000"

        android:strokeWidth="2"/>

    <path

        android:pathData="M100,43L180,43A1,1 0,0 1,181 44L181,92A1,1 0,0 1,180 93L100,93A1,1 0,0 1,99 92L99,44A1,1 0,0 1,100 43z"

        android:strokeColor="#00000000"

        android:fillType="evenOdd"

        android:fillColor="#FFFFFF"

        android:strokeWidth="1"/>

    <path

        android:pathData="M76.63,54L71.13,54L67.01,58.2L67,66.6C67,67.37 67.62,68 68.38,68L76.63,68C77.38,68 78,67.37 78,66.6L78,55.4C78,54.63 77.38,54 76.63,54ZM72.5,58.2L71.13,58.2L71.13,55.4L72.5,55.4L72.5,58.2ZM74.56,58.2L73.19,58.2L73.19,55.4L74.56,55.4L74.56,58.2ZM76.63,58.2L75.25,58.2L75.25,55.4L76.63,55.4L76.63,58.2Z"

        android:strokeColor="#00000000"

        android:fillType="nonZero"

        android:fillAlpha="0.87"

        android:fillColor="?android:attr/colorAccent"

        android:strokeWidth="1"/>

    <path

        android:pathData="M66.99,82L63,86L66.99,90L66.99,87L74,87L74,85L66.99,85L66.99,82ZM81,80L77.01,76L77.01,79L70,79L70,81L77.01,81L77.01,84L81,80Z"

        android:strokeColor="#00000000"

        android:fillType="nonZero"

        android:fillAlpha="0.87"

        android:fillColor="?android:attr/colorAccent"

        android:strokeWidth="1"/>

    <path

        android:pathData="M72,72m-71.04,0a71.04,71.04 0,1 1,142.08 0a71.04,71.04 0,1 1,-142.08 0"

        android:fillType="evenOdd"

        android:strokeColor="#DADCE0"

        android:fillColor="#00000000"

        android:strokeWidth="1.92"/>

</vector>