diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-20 18:10:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-20 18:10:48 +0000 |
| commit | 426f52a3883dc29b419f6af160c3f9e0cb2222cd (patch) | |
| tree | a7d1c89b8d282ca24faa4c8b9bdeb3c1ab663497 | |
| parent | 441d3d76933f2d6f834726b0870dbed9bf0914c1 (diff) | |
| parent | c5d583e389a07944dfe57db506bd25534cc0e821 (diff) | |
| download | Media-426f52a3883dc29b419f6af160c3f9e0cb2222cd.tar.gz | |
Merge "Don't allow nested FocusAreas in error fragment" into rvc-qpr-dev
| -rw-r--r-- | res/layout/fragment_error.xml | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/res/layout/fragment_error.xml b/res/layout/fragment_error.xml index 492aa80..02f4202 100644 --- a/res/layout/fragment_error.xml +++ b/res/layout/fragment_error.xml @@ -14,43 +14,53 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.car.ui.FocusArea +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - app:highlightPaddingTop="@dimen/car_ui_toolbar_first_row_height"> - - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/ui_guides"/> - - <com.android.car.apps.common.UxrTextView - android:id="@+id/error_message" - style="@style/FullScreenErrorMessageStyle" - android:layout_marginHorizontal="@dimen/fragment_error_message_margin_x" - app:layout_constraintVertical_chainStyle="packed" - app:layout_constraintStart_toStartOf="@+id/ui_content_start_guideline" - app:layout_constraintEnd_toEndOf="@+id/ui_content_end_guideline" - app:layout_constraintTop_toBottomOf="@+id/ui_content_top_guideline" - app:layout_constraintBottom_toTopOf="@+id/error_button" - /> - - <com.android.car.apps.common.UxrButton - android:id="@+id/error_button" - style="@style/FullScreenErrorButtonStyle" - android:layout_marginTop="@dimen/fragment_error_button_margin_top" - android:layout_marginBottom="@dimen/fragment_error_button_margin_bottom" - app:layout_constraintStart_toStartOf="@+id/ui_content_start_guideline" - app:layout_constraintEnd_toEndOf="@+id/ui_content_end_guideline" - app:layout_constraintTop_toBottomOf="@+id/error_message" - app:layout_constraintBottom_toBottomOf="@+id/ui_content_bottom_guideline" - /> - - <include layout="@layout/car_ui_base_layout_toolbar"/> - - </androidx.constraintlayout.widget.ConstraintLayout> - -</com.android.car.ui.FocusArea> + android:layout_height="match_parent"> + + <include layout="@layout/ui_guides"/> + + <com.android.car.ui.FocusArea + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintStart_toStartOf="@+id/ui_content_start_guideline" + app:layout_constraintEnd_toEndOf="@+id/ui_content_end_guideline" + app:layout_constraintTop_toBottomOf="@+id/ui_content_top_guideline" + app:layout_constraintBottom_toBottomOf="@+id/ui_content_bottom_guideline"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_constraintVertical_chainStyle="packed"> + + <com.android.car.apps.common.UxrTextView + android:id="@+id/error_message" + style="@style/FullScreenErrorMessageStyle" + android:layout_marginHorizontal="@dimen/fragment_error_message_margin_x" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@+id/error_button" + /> + + <com.android.car.apps.common.UxrButton + android:id="@+id/error_button" + style="@style/FullScreenErrorButtonStyle" + android:layout_marginTop="@dimen/fragment_error_button_margin_top" + android:layout_marginBottom="@dimen/fragment_error_button_margin_bottom" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/error_message" + app:layout_constraintBottom_toBottomOf="parent" + /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + </com.android.car.ui.FocusArea> + + <include layout="@layout/car_ui_base_layout_toolbar"/> + +</androidx.constraintlayout.widget.ConstraintLayout> |