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

Commit ac18eafa authored by Michael Kwan's avatar Michael Kwan Committed by android-build-merger
Browse files

Update progress bar and progress dialog to match UX specs for watch. am: f930e5b9 am: c8eb232b 

am: 05aed4e0

Change-Id: Ibdb760acf53a302db8060b78d98cb48dbca0874b
parents 60ef4259 05aed4e0

core/res/res/layout-watch/progress_dialog_material.xml

+3 −2
Original line number Diff line number Diff line
@@ -32,14 +32,15 @@ 


        <ProgressBar

            android:id="@id/progress"

            style="?android:attr/progressBarStyleSmall"

            style="?android:attr/progressBarStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:max="10000"

            android:layout_marginEnd="?attr/dialogPreferredPadding" />

            android:layout_marginEnd="8dp" />



        <TextView

            android:id="@+id/message"

            android:textAppearance="?attr/textAppearanceListItem"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical" />

core/res/res/values-watch/dimens_material.xml

+5 −0
Original line number Diff line number Diff line
@@ -39,4 +39,9 @@ 
    <!-- Date and time picker legacy dimens -->

    <dimen name="picker_top_margin">1dip</dimen>

    <dimen name="picker_bottom_margin">1dip</dimen>



    <!-- Progress bar dimens -->

    <dimen name="progress_bar_size_small">16dip</dimen>

    <dimen name="progress_bar_size_medium">32dip</dimen>

    <dimen name="progress_bar_size_large">64dip</dimen>

</resources>

core/res/res/values/dimens_material.xml

+5 −0
Original line number Diff line number Diff line
@@ -193,4 +193,9 @@ 
    <!-- Date and time picker legacy dimens -->

    <dimen name="picker_top_margin">16dip</dimen>

    <dimen name="picker_bottom_margin">16dip</dimen>



    <!-- Progress bar dimens -->

    <dimen name="progress_bar_size_small">16dip</dimen>

    <dimen name="progress_bar_size_medium">48dp</dimen>

    <dimen name="progress_bar_size_large">76dp</dimen>

</resources>

core/res/res/values/styles_material.xml

+12 −0
Original line number Diff line number Diff line
@@ -739,6 +739,10 @@ please see styles_device_defaults.xml. 


    <style name="Widget.Material.ProgressBar" parent="Widget.ProgressBar">

        <item name="indeterminateDrawable">@drawable/progress_medium_material</item>

        <item name="minWidth">@dimen/progress_bar_size_medium</item>

        <item name="maxWidth">@dimen/progress_bar_size_medium</item>

        <item name="minHeight">@dimen/progress_bar_size_medium</item>

        <item name="maxHeight">@dimen/progress_bar_size_medium</item>

    </style>



    <style name="Widget.Material.ProgressBar.Inverse"/>
@@ -752,6 +756,10 @@ please see styles_device_defaults.xml. 


    <style name="Widget.Material.ProgressBar.Small" parent="Widget.ProgressBar.Small">

        <item name="indeterminateDrawable">@drawable/progress_small_material</item>

        <item name="minWidth">@dimen/progress_bar_size_small</item>

        <item name="maxWidth">@dimen/progress_bar_size_small</item>

        <item name="minHeight">@dimen/progress_bar_size_small</item>

        <item name="maxHeight">@dimen/progress_bar_size_small</item>

    </style>



    <style name="Widget.Material.ProgressBar.Small.Inverse"/>
@@ -759,6 +767,10 @@ please see styles_device_defaults.xml. 


    <style name="Widget.Material.ProgressBar.Large" parent="Widget.ProgressBar.Large">

        <item name="indeterminateDrawable">@drawable/progress_large_material</item>

        <item name="minWidth">@dimen/progress_bar_size_large</item>

        <item name="maxWidth">@dimen/progress_bar_size_large</item>

        <item name="minHeight">@dimen/progress_bar_size_large</item>

        <item name="maxHeight">@dimen/progress_bar_size_large</item>

    </style>



    <style name="Widget.Material.ProgressBar.Large.Inverse"/>