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

Commit 7fb98b34 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode 

Change-Id: I0a9cfbc6aa6919da3198a20aae6159bd867afe87
parent 4e7b551f

core/java/android/widget/ProgressBar.java

+12 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ public class ProgressBar extends View { 
                    Shader.TileMode.REPEAT, Shader.TileMode.CLAMP);

            shapeDrawable.getPaint().setShader(bitmapShader);



            return (clip) ? new ClipDrawable(shapeDrawable, Gravity.START,

            return (clip) ? new ClipDrawable(shapeDrawable, Gravity.LEFT,

                    ClipDrawable.HORIZONTAL) : shapeDrawable;

        }
@@ -1037,6 +1037,11 @@ public class ProgressBar extends View { 
                    }

                }

            }

            if (isLayoutRtl()) {

                int tempLeft = left;

                left = w - right;

                right = w - tempLeft;

            }

            mIndeterminateDrawable.setBounds(left, top, right, bottom);

        }
@@ -1054,7 +1059,12 @@ public class ProgressBar extends View { 
            // Translate canvas so a indeterminate circular progress bar with padding

            // rotates properly in its animation

            canvas.save();

            if(isLayoutRtl()) {

                canvas.translate(getWidth() - mPaddingRight, mPaddingTop);

                canvas.scale(-1.0f, 1.0f);

            } else {

                canvas.translate(mPaddingLeft, mPaddingTop);

            }

            long time = getDrawingTime();

            if (mHasAnimation) {

                mAnimation.getTransformation(time, mTransformation);

core/res/res/drawable/progress_horizontal_holo_dark.xml

+0 −2
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ 


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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/progress_secondary_holo_dark" />

    </item>



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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/progress_primary_holo_dark" />

    </item>

core/res/res/drawable/progress_horizontal_holo_light.xml

+0 −2
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ 


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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/progress_secondary_holo_light" />

    </item>



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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/progress_primary_holo_light" />

    </item>

core/res/res/drawable/scrubber_progress_horizontal_holo_dark.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,12 +19,10 @@ 
            android:drawable="@android:drawable/scrubber_track_holo_dark" />

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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/scrubber_secondary_holo" />

    </item>

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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/scrubber_primary_holo" />

    </item>

</layer-list>

core/res/res/drawable/scrubber_progress_horizontal_holo_light.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,12 +19,10 @@ 
            android:drawable="@android:drawable/scrubber_track_holo_light" />

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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/scrubber_secondary_holo" />

    </item>

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

        <scale android:scaleWidth="100%"

               android:scaleGravity="start"

               android:drawable="@android:drawable/scrubber_primary_holo" />

    </item>

</layer-list>