Merge "Use appropriate start padding for clear all button" into ub-launcher3-rvc-dev
This commit is contained in:
@@ -56,7 +56,8 @@ public class ClearAllButton extends Button implements PageCallbacks {
|
||||
@Override
|
||||
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
|
||||
super.onLayout(changed, left, top, right, bottom);
|
||||
mScrollOffset = mIsRtl ? mParent.getPaddingRight() / 2 : - mParent.getPaddingLeft() / 2;
|
||||
PagedOrientationHandler orientationHandler = mParent.getPagedOrientationHandler();
|
||||
mScrollOffset = orientationHandler.getClearAllScrollOffset(mParent, mIsRtl);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -125,6 +125,11 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
|
||||
return rect.height();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getClearAllScrollOffset(View view, boolean isRtl) {
|
||||
return (isRtl ? view.getPaddingBottom() : - view.getPaddingTop()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryDimension(View view) {
|
||||
return view.getWidth();
|
||||
|
||||
@@ -62,6 +62,7 @@ public interface PagedOrientationHandler {
|
||||
float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId);
|
||||
int getMeasuredSize(View view);
|
||||
float getPrimarySize(RectF rect);
|
||||
int getClearAllScrollOffset(View view, boolean isRtl);
|
||||
int getSecondaryDimension(View view);
|
||||
FloatProperty<View> getPrimaryViewTranslate();
|
||||
FloatProperty<View> getSecondaryViewTranslate();
|
||||
|
||||
@@ -122,6 +122,11 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
|
||||
return rect.width();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getClearAllScrollOffset(View view, boolean isRtl) {
|
||||
return (isRtl ? view.getPaddingRight() : - view.getPaddingLeft()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryDimension(View view) {
|
||||
return view.getHeight();
|
||||
|
||||
@@ -75,4 +75,15 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
|
||||
public float getTaskMenuY(float y, View thumbnailView) {
|
||||
return y + thumbnailView.getMeasuredHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getClearAllScrollOffset(View view, boolean isRtl) {
|
||||
return (isRtl ? view.getPaddingTop() : - view.getPaddingBottom()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPrimaryAndResetSecondaryTranslate(View view, float translation) {
|
||||
view.setTranslationX(0);
|
||||
view.setTranslationY(-translation);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user