Skip to content

[TextInputLayout] Add baseline alignment support #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[TextInputLayout] Add baseline alignment support #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion lib/src/android/support/design/widget/TextInputLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,10 @@ public TextInputLayout(Context context, AttributeSet attrs, int defStyleAttr) {
setWillNotDraw(false);
setAddStatesFromChildren(true);

mInputFrame = new FrameLayout(context);
mInputFrame = new BaselineAlignableFrameLayout(context);
mInputFrame.setAddStatesFromChildren(true);
addView(mInputFrame);
setBaselineAlignedChildIndex(0);

mCollapsingTextHelper.setTextSizeInterpolator(AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
mCollapsingTextHelper.setPositionInterpolator(new AccelerateInterpolator());
Expand Down Expand Up @@ -1470,4 +1471,27 @@ private static boolean arrayContains(int[] array, int value) {
}
return false;
}

private static class BaselineAlignableFrameLayout extends FrameLayout {

public BaselineAlignableFrameLayout(Context context) {
super(context);
}

public BaselineAlignableFrameLayout(Context context, AttributeSet attrs) {
super(context, attrs);
}

public BaselineAlignableFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}

@Override
public int getBaseline() {
if (this.getChildCount() > 0) {
return this.getChildAt(0).getBaseline();
}
return super.getBaseline();
}
}
}