Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7397555a authored by Alex Stetson's avatar Alex Stetson
Browse files

Move car alert dialog layouts 

Move our alert dialog material layouts from car_product/overlay so we're
not directly overlaying the material dialogs

Bug: 158516267
Test: manual
Change-Id: I43ca30981f5a3d169ec8debe33c5444055666a43
parent c0f177b1

core/res/res/layout-car/car_alert_dialog.xml

0 → 100644
+85 −0
Original line number Diff line number Diff line 
<?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>

core/res/res/layout-car/car_alert_dialog_button_bar.xml

0 → 100644
+64 −0
Original line number Diff line number Diff line 
<?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>

core/res/res/layout-car/car_alert_dialog_title.xml

0 → 100644
+62 −0
Original line number Diff line number Diff line 
<?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>