Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #7158772 ProgressBar / SeekBar / RatingBar drawables should be reversed when in RTL mode" into jb-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-09-25 15:58:55 -07:00
committed by Android (Google) Code Review
parent e79275a9f6 7fb98b3449
commit e8e98704f3
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/ProgressBar.java
View File

@@ -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;
}
@@ -1040,6 +1040,11 @@ public class ProgressBar extends View {
}
}
}
if (isLayoutRtl()) {
int tempLeft = left;
left = w - right;
right = w - tempLeft;
}
mIndeterminateDrawable.setBounds(left, top, right, bottom);
}
@@ -1057,7 +1062,12 @@ public class ProgressBar extends View {
// Translate canvas so a indeterminate circular progress bar with padding
// rotates properly in its animation
canvas.save();
canvas.translate(mPaddingLeft, mPaddingTop);
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);

2
core/res/res/drawable/progress_horizontal_holo_dark.xml
View File

@@ -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>

2
core/res/res/drawable/progress_horizontal_holo_light.xml
View File

@@ -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>

2
core/res/res/drawable/scrubber_progress_horizontal_holo_dark.xml
View File

@@ -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>

2
core/res/res/drawable/scrubber_progress_horizontal_holo_light.xml
View File

@@ -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>