Skip to content

Commit 0c3dbbd

Browse files
committed
[TimePicker] Fix dialog buttons being clipped at the bottom
1 parent fea726f commit 0c3dbbd

1 file changed

Lines changed: 21 additions & 13 deletions

File tree

lib/java/com/google/android/material/timepicker/res/layout/material_timepicker_dialog.xml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,33 +68,41 @@
6868
android:id="@+id/material_timepicker_mode_button"
6969
style="?attr/imageButtonStyle"
7070
android:layout_width="wrap_content"
71-
android:layout_height="wrap_content"
72-
android:layout_marginStart="12dp"
73-
app:layout_constraintStart_toStartOf="parent"
74-
app:layout_constraintBottom_toBottomOf="parent" />
71+
android:layout_height="wrap_content" />
72+
73+
<Space
74+
android:id="@+id/material_timepicker_mode_cancel_space"
75+
android:layout_width="0dp"
76+
android:layout_height="wrap_content" />
7577

7678
<Button
7779
android:id="@+id/material_timepicker_cancel_button"
7880
style="?attr/borderlessButtonStyle"
7981
android:layout_width="wrap_content"
8082
android:layout_height="wrap_content"
81-
android:layout_marginTop="2dp"
82-
android:layout_marginEnd="8dp"
8383
android:minWidth="72dp"
84-
android:text="@string/mtrl_timepicker_cancel"
85-
app:layout_constraintEnd_toStartOf="@id/material_timepicker_ok_button"
86-
app:layout_constraintTop_toTopOf="@id/material_timepicker_mode_button" />
84+
android:text="@string/mtrl_timepicker_cancel" />
8785

8886
<Button
8987
android:id="@+id/material_timepicker_ok_button"
9088
style="?attr/borderlessButtonStyle"
9189
android:layout_width="wrap_content"
9290
android:layout_height="wrap_content"
93-
android:layout_marginTop="2dp"
94-
android:layout_marginEnd="8dp"
9591
android:minWidth="64dp"
96-
android:text="@string/mtrl_timepicker_confirm"
92+
android:text="@string/mtrl_timepicker_confirm" />
93+
94+
<androidx.constraintlayout.helper.widget.Flow
95+
android:id="@+id/material_timepicker_button_bar"
96+
android:layout_width="0dp"
97+
android:layout_height="wrap_content"
98+
android:paddingStart="12dp"
99+
android:paddingEnd="8dp"
100+
app:flow_horizontalGap="8dp"
101+
app:flow_horizontalStyle="packed"
102+
app:flow_verticalAlign="center"
103+
app:constraint_referenced_ids="material_timepicker_mode_button,material_timepicker_mode_cancel_space,material_timepicker_cancel_button,material_timepicker_ok_button"
104+
app:layout_constraintBottom_toBottomOf="parent"
97105
app:layout_constraintEnd_toEndOf="parent"
98-
app:layout_constraintTop_toTopOf="@id/material_timepicker_mode_button" />
106+
app:layout_constraintStart_toStartOf="parent"/>
99107

100108
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)