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

Commit b465005c authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Update the storage summary header. 

This changes it to now have a donut graph and reflects the new UI.
Finalized redlines are still pending, so there will be a follow
up patch to get everything aligned as per the mocks.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: Ic12a77bd9be335af14f80886d1ecc24c82940e9b
parent 033dc469

res/layout/storage_summary_donut.xml

+50 −36
Original line number Diff line number Diff line
@@ -14,18 +14,23 @@ 
     limitations under the License.

-->



<!-- TODO: Update this view to not match the existing storage summary.-->

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

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:orientation="horizontal"

              android:gravity="center_vertical"

              android:background="?android:attr/selectableItemBackground">



    <LinearLayout android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:orientation="vertical"

                  android:minHeight="?android:attr/listPreferredItemHeightSmall"

                  android:gravity="center_vertical"

                  android:paddingStart="@dimen/preference_no_icon_padding_start"

              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                  android:paddingEnd="@dimen/storage_summary_padding_end"

                  android:paddingTop="16dip"

                  android:paddingBottom="16dip"

              android:background="?android:attr/selectableItemBackground">

                  android:enabled="false">



        <TextView

            android:id="@android:id/title"
@@ -41,20 +46,29 @@ 


        <TextView

            android:id="@android:id/summary"

            android:layout_marginStart="4dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Body1"

            android:maxLines="10" />



    <ProgressBar

        android:id="@android:id/progress"

        android:layout_width="match_parent"

        android:layout_height="8dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="8dp"

        android:visibility="gone"

        android:max="100"

        style="?android:attr/progressBarStyleHorizontal" />

        <Button

            android:id="@+id/deletion_helper_button"

            android:theme="@style/FreeUpStorageButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/summary"

            android:text="@string/storage_menu_free"/>

    </LinearLayout>



    <com.android.settings.widget.DonutView

        android:id="@+id/donut"

        android:layout_width="100dp"

        android:layout_height="100dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:minWidth="58dip"

        android:gravity="end|center_vertical"/>



</LinearLayout>

res/values/colors.xml

+4 −1
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ 
    <!-- Gestures settings -->

    <color name="gestures_setting_background_color">#f5f5f5</color>



    <!-- TODO: revert it after the SettingsShadowResources is globally finalized -->

    <color name="status_bar_color">#3c3c3c</color>



    <!-- Color for the background of the donut graph.-->

    <color name="donut_background_grey">#ffd7d7d7</color>



</resources>

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -307,4 +307,7 @@ 
    <!-- Padding for the escalation card in normal dimens -->

    <dimen name="support_escalation_card_padding_start">40dp</dimen>

    <dimen name="support_escalation_card_padding_end">40dp</dimen>



    <!-- Padding between the donut and the storage summary. -->

    <dimen name="storage_summary_padding_end">16dp</dimen>

</resources>

res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -8019,4 +8019,14 @@ 
    <!-- Preference label for the Files storage section. [CHAR LIMIT=50] -->

    <string name="storage_files">Files</string>









    <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->









    <string name="storage_settings_2" >Phone Storage</string>

















    <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->









    <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g> used</small></small></string>









    <!-- Summary of a single storage volume free space. [CHAR LIMIT=48]-->









    <string name="storage_volume_free"><xliff:g id="total" example="32GB">%1$s</xliff:g> free</string>









    <!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]-->









    <string name="storage_percent_used"><xliff:g id="percent" example="50%">%1$s</xliff:g>%%</string>

















</resources>

























res/values/styles.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -437,4 +437,10 @@







    </style>



















    <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>



















    <style name="FreeUpStorageButton">









        <item name="android:buttonStyle">@android:style/Widget.Material.Button</item>









        <item name="android:colorButtonNormal">#fff</item>









    </style>



















</resources>