|
68 | 68 | android:id="@+id/material_timepicker_mode_button" |
69 | 69 | style="?attr/imageButtonStyle" |
70 | 70 | 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" /> |
75 | 77 |
|
76 | 78 | <Button |
77 | 79 | android:id="@+id/material_timepicker_cancel_button" |
78 | 80 | style="?attr/borderlessButtonStyle" |
79 | 81 | android:layout_width="wrap_content" |
80 | 82 | android:layout_height="wrap_content" |
81 | | - android:layout_marginTop="2dp" |
82 | | - android:layout_marginEnd="8dp" |
83 | 83 | 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" /> |
87 | 85 |
|
88 | 86 | <Button |
89 | 87 | android:id="@+id/material_timepicker_ok_button" |
90 | 88 | style="?attr/borderlessButtonStyle" |
91 | 89 | android:layout_width="wrap_content" |
92 | 90 | android:layout_height="wrap_content" |
93 | | - android:layout_marginTop="2dp" |
94 | | - android:layout_marginEnd="8dp" |
95 | 91 | 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" |
97 | 105 | app:layout_constraintEnd_toEndOf="parent" |
98 | | - app:layout_constraintTop_toTopOf="@id/material_timepicker_mode_button" /> |
| 106 | + app:layout_constraintStart_toStartOf="parent"/> |
99 | 107 |
|
100 | 108 | </androidx.constraintlayout.widget.ConstraintLayout> |
0 commit comments