Skip to content

Commit f39b04c

Browse files
authored
Revert baseline textview change (#1562)
2 parents 16da77e + 1fac68d commit f39b04c

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.firebase.ui.auth.util.ui;
2+
3+
import android.content.Context;
4+
import android.support.annotation.RestrictTo;
5+
import android.support.design.widget.TextInputLayout;
6+
import android.util.AttributeSet;
7+
import android.widget.EditText;
8+
9+
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
10+
public class BaselineTextInputLayout extends TextInputLayout {
11+
public BaselineTextInputLayout(Context context) {
12+
super(context);
13+
}
14+
15+
public BaselineTextInputLayout(Context context, AttributeSet attrs) {
16+
super(context, attrs);
17+
}
18+
19+
public BaselineTextInputLayout(Context context, AttributeSet attrs, int defStyleAttr) {
20+
super(context, attrs, defStyleAttr);
21+
}
22+
23+
@Override
24+
public int getBaseline() {
25+
EditText text = getEditText();
26+
return text == null ? super.getBaseline() : text.getPaddingTop() + text.getBaseline();
27+
}
28+
}

auth/src/main/res/layout/fui_phone_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
app:layout_constraintStart_toStartOf="parent"
2626
app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
2727

28-
<android.support.design.widget.TextInputLayout
28+
<com.firebase.ui.auth.util.ui.BaselineTextInputLayout
2929
android:id="@+id/phone_layout"
3030
style="@style/FirebaseUI.TextInputLayout.PhoneField"
3131
android:layout_width="0dp"
@@ -39,7 +39,7 @@
3939
style="@style/FirebaseUI.TextInputEditText.PhoneField"
4040
android:imeOptions="actionDone" />
4141

42-
</android.support.design.widget.TextInputLayout>
42+
</com.firebase.ui.auth.util.ui.BaselineTextInputLayout>
4343

4444
<Button
4545
android:id="@+id/send_code"

0 commit comments

Comments
 (0)