зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 5a84ab13274a (bug 1337440) for Android build bustage
This commit is contained in:
Родитель
f6e0ca5fb2
Коммит
4a0b7c1001
|
@ -214,14 +214,6 @@ public class CirclePageIndicator
|
|||
return mSnap;
|
||||
}
|
||||
|
||||
private boolean isRtl() {
|
||||
return ViewUtils.isLayoutRtl(this);
|
||||
}
|
||||
|
||||
private float getRadiusRelativly() {
|
||||
return getRadius() * (isRtl() ? -1 : 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDraw(Canvas canvas) {
|
||||
super.onDraw(canvas);
|
||||
|
@ -239,25 +231,23 @@ public class CirclePageIndicator
|
|||
return;
|
||||
}
|
||||
|
||||
final int longSize;
|
||||
final int longPaddingBefore;
|
||||
final int longPaddingAfter;
|
||||
final int shortPaddingBefore;
|
||||
final float threeRadius;
|
||||
int longSize;
|
||||
int longPaddingBefore;
|
||||
int longPaddingAfter;
|
||||
int shortPaddingBefore;
|
||||
if (mOrientation == HORIZONTAL) {
|
||||
longSize = getWidth();
|
||||
longPaddingBefore = getPaddingLeft();
|
||||
longPaddingAfter = getPaddingRight();
|
||||
shortPaddingBefore = getPaddingTop();
|
||||
threeRadius = getRadiusRelativly() * SEPARATION_FACTOR;
|
||||
} else {
|
||||
longSize = getHeight();
|
||||
longPaddingBefore = getPaddingTop();
|
||||
longPaddingAfter = getPaddingBottom();
|
||||
shortPaddingBefore = getPaddingLeft();
|
||||
threeRadius = mRadius * SEPARATION_FACTOR;
|
||||
}
|
||||
|
||||
final float threeRadius = mRadius * SEPARATION_FACTOR;
|
||||
final float shortOffset = shortPaddingBefore + mRadius;
|
||||
float longOffset = longPaddingBefore + mRadius;
|
||||
if (mCentered) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче