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

Commit 79cc73a0 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am bac8e12e: Move layer-list to be top-level element in seek bar progress 

* commit 'bac8e12e':
  Move layer-list to be top-level element in seek bar progress
parents b9f0cae9 bac8e12e

core/java/android/widget/ProgressBar.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1241,7 +1241,7 @@ public class ProgressBar extends View { 
    private synchronized void doRefreshProgress(int id, int progress, boolean fromUser,

    private synchronized void doRefreshProgress(int id, int progress, boolean fromUser,

            boolean callBackToApp) {

            boolean callBackToApp) {

        float scale = mMax > 0 ? (float) progress / (float) mMax : 0;

        float scale = mMax > 0 ? (float) progress / (float) mMax : 0;

        final Drawable d = mCurrentDrawable.getCurrent();

        final Drawable d = mCurrentDrawable;

        if (d != null) {

        if (d != null) {

            Drawable progressDrawable = null;

            Drawable progressDrawable = null;

core/res/res/drawable/scrubber_progress_horizontal_material.xml

+27 −21
Original line number Original line Diff line number Diff line
@@ -14,29 +14,35 @@ 
     limitations under the License.

     limitations under the License.

-->

-->





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

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false">

        <nine-patch android:src="@drawable/scrubber_track_mtrl_alpha"

            android:tint="?attr/colorControlNormal" />

    </item>

    <item>

        <layer-list>

    <item android:id="@id/background">

    <item android:id="@id/background">

        <nine-patch android:src="@drawable/scrubber_track_mtrl_alpha"

        <nine-patch android:src="@drawable/scrubber_track_mtrl_alpha"

                    android:tint="?attr/colorControlNormal" />

                    android:tint="?attr/colorControlNormal" />

    </item>

    </item>

    <item android:id="@id/secondaryProgress">

    <item android:id="@id/secondaryProgress">

        <scale android:scaleWidth="100%">

        <scale android:scaleWidth="100%">

            <selector>

                <item android:state_enabled="false">

                    <color android:color="@color/transparent" />

                </item>

                <item>

                    <nine-patch android:src="@drawable/scrubber_primary_mtrl_alpha"

                    <nine-patch android:src="@drawable/scrubber_primary_mtrl_alpha"

                                android:tint="?attr/colorControlNormal" />

                                android:tint="?attr/colorControlNormal" />

                </item>

            </selector>

        </scale>

        </scale>

    </item>

    </item>

    <item android:id="@id/progress">

    <item android:id="@id/progress">

        <scale android:scaleWidth="100%">

        <scale android:scaleWidth="100%">

            <selector>

                <item android:state_enabled="false">

                    <color android:color="@color/transparent" />

                </item>

                <item>

                    <nine-patch android:src="@drawable/scrubber_primary_mtrl_alpha"

                    <nine-patch android:src="@drawable/scrubber_primary_mtrl_alpha"

                                android:tint="?attr/colorControlActivated" />

                                android:tint="?attr/colorControlActivated" />

                </item>

            </selector>

        </scale>

        </scale>

    </item>

    </item>

</layer-list>
 
</layer-list>
 
 No newline at end of file
 
    </item>

</selector>