From be6b3615968c97922475b196ace2ee4a1079983a Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Fri, 19 Jan 2018 19:48:48 -0800 Subject: [PATCH 1/3] [TextInputLayout] Add baseline alignment support --- lib/java/android/support/design/widget/TextInputLayout.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/java/android/support/design/widget/TextInputLayout.java b/lib/java/android/support/design/widget/TextInputLayout.java index f444f302e66..872b346d708 100644 --- a/lib/java/android/support/design/widget/TextInputLayout.java +++ b/lib/java/android/support/design/widget/TextInputLayout.java @@ -871,6 +871,12 @@ public EditText getEditText() { return editText; } + @Override + public int getBaseline() { + EditText text = getEditText(); + return text == null ? super.getBaseline() : text.getPaddingTop() + text.getBaseline(); + } + /** * Set the hint to be displayed in the floating label, if enabled. * From fba6413a08afd87088c5f5608e28e05f10122490 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Tue, 4 Sep 2018 10:49:45 -0700 Subject: [PATCH 2/3] Address style concerns --- .../google/android/material/textfield/TextInputLayout.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java index 98c07abbaf7..bc83294d802 100644 --- a/lib/java/com/google/android/material/textfield/TextInputLayout.java +++ b/lib/java/com/google/android/material/textfield/TextInputLayout.java @@ -797,8 +797,11 @@ public EditText getEditText() { @Override public int getBaseline() { - EditText text = getEditText(); - return text == null ? super.getBaseline() : text.getPaddingTop() + text.getBaseline(); + if (editText != null) { + return editText.getPaddingTop() + editText.getBaseline(); + } else { + return super.getBaseline(); + } } /** From 12ddd96a00213c6d7b99fb8add640eab4bce1e27 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Tue, 4 Sep 2018 13:19:11 -0700 Subject: [PATCH 3/3] Address review comments --- .../com/google/android/material/textfield/TextInputLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java index bc83294d802..d8ab5ea8c18 100644 --- a/lib/java/com/google/android/material/textfield/TextInputLayout.java +++ b/lib/java/com/google/android/material/textfield/TextInputLayout.java @@ -798,7 +798,7 @@ public EditText getEditText() { @Override public int getBaseline() { if (editText != null) { - return editText.getPaddingTop() + editText.getBaseline(); + return editText.getBaseline() + getPaddingTop() + calculateLabelMarginTop(); } else { return super.getBaseline(); }