Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move car alert dialog layouts" into rvc-dev am: ec10faabd4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825379

Change-Id: Ie28f990cc11187313d87b0f0970883ed347edf36
This commit is contained in:
Alex Stetson
2020-06-12 00:08:34 +00:00
committed by Automerger Merge Worker
parent bc5db39866 ec10faabd4
commit a6eb4393b4
3 changed files with 211 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
core/res/res/layout-car/car_alert_dialog.xml Normal file
View File

@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<com.android.internal.widget.AlertDialogLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start|top"
android:orientation="vertical">
<include layout="@layout/car_alert_dialog_title" />
<FrameLayout
android:id="@+id/contentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp">
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Space
android:id="@+id/textSpacerNoTitle"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_no_title_padding_top" />
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/text_view_start_margin"
android:layout_marginEnd="@dimen/text_view_end_margin"
style="@style/CarBody2"/>
<!-- we don't need this spacer, but the id needs to be here for compatibility -->
<Space
android:id="@+id/textSpacerNoButtons"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="0dp" />
</LinearLayout>
</ScrollView>
</FrameLayout>
<FrameLayout
android:id="@+id/customPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp">
<FrameLayout
android:id="@+id/custom"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/car_alert_dialog_button_bar" />
</com.android.internal.widget.AlertDialogLayout>

64
core/res/res/layout-car/car_alert_dialog_button_bar.xml Normal file
View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/buttonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbarAlwaysDrawVerticalTrack="true"
android:scrollIndicators="top|bottom"
android:fillViewport="true"
style="?attr/buttonBarStyle">
<com.android.internal.widget.ButtonBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/button_bar_layout_start_padding"
android:paddingEnd="@dimen/button_bar_layout_end_padding"
android:paddingTop="@dimen/button_bar_layout_top_padding"
android:layoutDirection="locale"
android:orientation="horizontal"
android:gravity="left|center_vertical">
<Button
android:id="@+id/button3"
style="@style/CarAction1"
android:background="@drawable/car_dialog_button_background"
android:layout_marginRight="@dimen/button_end_margin"
android:layout_width="wrap_content"
android:layout_height="@dimen/button_layout_height" />
<Button
android:id="@+id/button2"
style="@style/CarAction1"
android:background="@drawable/car_dialog_button_background"
android:layout_marginRight="@dimen/button_end_margin"
android:layout_width="wrap_content"
android:layout_height="@dimen/button_layout_height" />
<Button
android:id="@+id/button1"
style="@style/CarAction1"
android:background="@drawable/car_dialog_button_background"
android:layout_width="wrap_content"
android:layout_height="@dimen/button_layout_height" />
<Space
android:id="@+id/spacer"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="invisible" />
</com.android.internal.widget.ButtonBarLayout>
</ScrollView>

62
core/res/res/layout-car/car_alert_dialog_title.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<!-- If the client uses a customTitle, it will be added here. -->
<RelativeLayout
android:id="@+id/title_template"
android:layout_width="match_parent"
android:layout_height="@dimen/car_card_header_height"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
android:layout_width="@dimen/image_size"
android:layout_height="@dimen/image_size"
android:layout_marginStart="@dimen/image_margin_start"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:scaleType="fitCenter"
android:src="@null" />
<com.android.internal.widget.DialogTitle
android:id="@+id/alertTitle"
android:maxLines="1"
android:ellipsize="none"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/icon"
android:textAlignment="viewStart"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/text_view_start_margin"
android:layout_marginEnd="@dimen/text_view_end_margin"
style="?attr/windowTitleStyle" />
</RelativeLayout>
<Space
android:id="@+id/titleDividerNoCustom"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="0dp" />
</LinearLayout>