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

Commit 3266b45d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add attr for customizing progress bar corner radius."

parents 4f7c4658 77a7142c

core/res/res/drawable/progress_horizontal_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
          android:gravity="center_vertical|fill_horizontal">

        <shape android:shape="rectangle"

               android:tint="?attr/colorControlNormal">

            <corners android:radius="?attr/progressBarCornerRadius" />

            <size android:height="@dimen/progress_bar_height_material" />

            <solid android:color="@color/white_disabled_material" />

        </shape>
@@ -28,6 +29,7 @@ 
        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle"

                   android:tint="?attr/colorControlActivated">

                <corners android:radius="?attr/progressBarCornerRadius" />

                <size android:height="@dimen/progress_bar_height_material" />

                <solid android:color="@color/white_disabled_material" />

            </shape>
@@ -38,6 +40,7 @@ 
        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle"

                   android:tint="?attr/colorControlActivated">

                <corners android:radius="?attr/progressBarCornerRadius" />

                <size android:height="@dimen/progress_bar_height_material" />

                <solid android:color="@color/white" />

            </shape>

core/res/res/drawable/seekbar_track_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
          android:gravity="center_vertical|fill_horizontal">

        <shape android:shape="rectangle"

               android:tint="@color/control_nodisable_material">

            <corners android:radius="?attr/progressBarCornerRadius" />

            <size android:height="@dimen/seekbar_track_background_height_material" />

            <solid android:color="@color/white_disabled_material" />

        </shape>
@@ -32,6 +33,7 @@ 
                <item>

                    <shape android:shape="rectangle"

                           android:tint="?attr/colorControlActivated">

                        <corners android:radius="?attr/progressBarCornerRadius" />

                        <size android:height="@dimen/seekbar_track_progress_height_material" />

                        <solid android:color="@color/white_disabled_material" />

                    </shape>
@@ -48,6 +50,7 @@ 
                <item>

                    <shape android:shape="rectangle"

                           android:tint="?attr/colorControlActivated">

                        <corners android:radius="?attr/progressBarCornerRadius" />

                        <size android:height="@dimen/seekbar_track_progress_height_material" />

                        <solid android:color="@color/white" />

                    </shape>

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -1019,6 +1019,9 @@ 
        <!-- Corner radius of buttons. -->

        <attr name="buttonCornerRadius" format="dimension" />



        <!-- Corner radius of progress bars. -->

        <attr name="progressBarCornerRadius" format="dimension" />



        <!-- Style for the search query widget. -->

        <attr name="searchViewStyle" format="reference" />

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -3331,6 +3331,8 @@ 
    <dimen name="config_dialogCornerRadius">2dp</dimen>

    <!-- Corner radius of system buttons -->

    <dimen name="config_buttonCornerRadius">@dimen/control_corner_material</dimen>

    <!-- Corner radius of system progress bars -->

    <dimen name="config_progressBarCornerRadius">@dimen/progress_bar_corner_material</dimen>

    <!-- Controls whether system buttons use all caps for text -->

    <bool name="config_buttonTextAllCaps">true</bool>

    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

core/res/res/values/dimens_material.xml

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
    <dimen name="seekbar_track_progress_height_material">2dp</dimen>



    <dimen name="progress_bar_height_material">4dp</dimen>

    <dimen name="progress_bar_corner_material">0dp</dimen>



    <!-- Material time picker dimensions. -->

    <!-- Text size for the time picker header HH:MM label. This value is large