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

Merge "Vertically center seek bar track and thumb when maxHeight is set"

Browse Source
This commit is contained in:
Alan Viverette
2015-02-26 21:48:40 +00:00
committed by Android (Google) Code Review
parent 248ed8282b 3afd8b0d1a
commit 39df5fea22
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/widget/AbsSeekBar.java
View File

@@ -403,23 +403,26 @@ public abstract class AbsSeekBar extends ProgressBar {
}
private void updateThumbAndTrackPos(int w, int h) {
final int paddedHeight = h - mPaddingTop - mPaddingBottom;
final Drawable track = getCurrentDrawable();
final Drawable thumb = mThumb;
// The max height does not incorporate padding, whereas the height
// parameter does.
final int trackHeight = Math.min(mMaxHeight, h - mPaddingTop - mPaddingBottom);
final int trackHeight = Math.min(mMaxHeight, paddedHeight);
final int thumbHeight = thumb == null ? 0 : thumb.getIntrinsicHeight();
// Apply offset to whichever item is taller.
final int trackOffset;
final int thumbOffset;
if (thumbHeight > trackHeight) {
trackOffset = (thumbHeight - trackHeight) / 2;
thumbOffset = 0;
final int offsetHeight = (paddedHeight - thumbHeight) / 2;
trackOffset = offsetHeight + (thumbHeight - trackHeight) / 2;
thumbOffset = offsetHeight + 0;
} else {
trackOffset = 0;
thumbOffset = (trackHeight - thumbHeight) / 2;
final int offsetHeight = (paddedHeight - trackHeight) / 2;
trackOffset = offsetHeight + 0;
thumbOffset = offsetHeight + (trackHeight - thumbHeight) / 2;
}
if (track != null) {

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

@@ -1235,24 +1235,6 @@ public class ProgressBar extends View {
}
}
private void setDrawableTint(int id, ColorStateList tint, Mode tintMode, boolean fallback) {
Drawable layer = null;
// We expect a layer drawable, so try to find the target ID.
final Drawable d = mCurrentDrawable;
if (d instanceof LayerDrawable) {
layer = ((LayerDrawable) d).findDrawableByLayerId(id);
}
if (fallback && layer == null) {
layer = d;
}
layer.mutate();
layer.setTintList(tint);
layer.setTintMode(tintMode);
}
private synchronized void doRefreshProgress(int id, int progress, boolean fromUser,
boolean callBackToApp) {
float scale = mMax > 0 ? (float) progress / (float) mMax : 0;