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

Commit 9c04abda authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Apply material 3 to fill dialog/save ui" into tm-dev am: 79c786ba am: 608b70f0 

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



Change-Id: I04470f1cb1ef62eabdeccd2f7b521e0ff1f7d143
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc4f73b3 608b70f0

core/res/res/drawable/bottomsheet_background.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">

    <corners

        android:topLeftRadius="@dimen/config_bottomDialogCornerRadius"

        android:topRightRadius="@dimen/config_bottomDialogCornerRadius"/>

    <solid android:color="?attr/colorBackground" />

        android:topLeftRadius="@dimen/autofill_dialog_corner_radius"

        android:topRightRadius="@dimen/autofill_dialog_corner_radius"/>

    <solid android:color="?attr/colorSurface" />

</shape>

core/res/res/drawable/btn_outlined.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2022 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.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

  <solid android:color="?attr/selectableItemBackground"/>

  <stroke android:width="1dp" android:color="?attr/colorAccentPrimaryVariant"/>

  <corners android:radius="28dp"/>

</shape>

core/res/res/drawable/btn_tonal.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2022 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.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

  <solid android:color="?attr/colorAccentPrimary"/>

  <corners android:radius="28dp"/>

</shape>

core/res/res/layout/autofill_fill_dialog.xml

+21 −10
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
    android:id="@+id/autofill_dialog_picker"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

    android:padding="@dimen/autofill_save_outer_top_padding"

    android:background="@drawable/bottomsheet_background"

    android:orientation="vertical">
@@ -29,8 +27,9 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:paddingStart="@dimen/autofill_save_inner_padding"

        android:paddingEnd="@dimen/autofill_save_inner_padding"

        android:paddingTop="24dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:orientation="vertical">



        <ImageView
@@ -59,6 +58,8 @@ 
        android:paddingStart="@dimen/autofill_save_inner_padding"

        android:paddingEnd="@dimen/autofill_save_inner_padding"

        android:visibility="gone"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:background="@drawable/autofill_dataset_picker_background"/>



    <ListView
@@ -69,22 +70,30 @@ 
        android:drawSelectorOnTop="true"

        android:clickable="true"

        android:divider="?android:attr/listDivider"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:background="@drawable/autofill_dataset_picker_background"

        android:visibility="gone"/>



    <com.android.internal.widget.ButtonBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="48dp"

        android:layout_gravity="end"

        android:padding="@dimen/autofill_save_button_bar_padding"

        android:clipToPadding="false"

        android:layout_marginTop="32dp"

        android:layout_marginBottom="18dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"

        android:orientation="horizontal">



        <Button

            android:id="@+id/autofill_dialog_no"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="?android:attr/buttonBarButtonStyle"

            android:layout_height="36dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            style="@style/AutofillHalfSheetOutlinedButton"

            android:text="@string/autofill_save_no">

        </Button>
@@ -98,8 +107,10 @@ 
        <Button

            android:id="@+id/autofill_dialog_yes"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/Widget.DeviceDefault.Button.Colored"

            android:layout_height="36dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            style="@style/AutofillHalfSheetTonalButton"

            android:text="@string/autofill_save_yes"

            android:visibility="gone" >

        </Button>

core/res/res/layout/autofill_save.xml

+22 −14
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/bottomsheet_background"

    android:orientation="vertical">



    <LinearLayout
@@ -29,7 +30,7 @@ 
        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

        android:paddingTop="@dimen/autofill_save_outer_top_padding"

        android:elevation="@dimen/autofill_elevation"

        android:background="?android:attr/colorBackground"

        android:background="?android:attr/colorSurface"

        android:orientation="vertical">



        <LinearLayout
@@ -73,13 +74,26 @@ 


        <com.android.internal.widget.ButtonBarLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="48dp"

            android:layout_gravity="end"

            android:padding="@dimen/autofill_save_button_bar_padding"

            android:clipToPadding="false"

            android:layout_weight="1"

            android:layout_marginTop="32dp"

            android:layout_marginBottom="18dp"

            android:layout_marginStart="24dp"

            android:layout_marginEnd="24dp"

            android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"

            android:orientation="horizontal">



            <Button

                android:id="@+id/autofill_save_no"

                android:layout_width="wrap_content"

                android:layout_height="36dp"

                android:layout_marginTop="6dp"

                android:layout_marginBottom="6dp"

                style="@style/AutofillHalfSheetOutlinedButton"

                android:text="@string/autofill_save_no">

            </Button>



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"
@@ -87,19 +101,13 @@ 
                android:visibility="invisible">

            </Space>



            <Button

                android:id="@+id/autofill_save_no"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="?android:attr/buttonBarButtonStyle"

                android:text="@string/autofill_save_no">

            </Button>



            <Button

                android:id="@+id/autofill_save_yes"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="@style/Widget.DeviceDefault.Button.Colored"

                android:layout_height="36dp"

                android:layout_marginTop="6dp"

                android:layout_marginBottom="6dp"

                style="@style/AutofillHalfSheetTonalButton"

                android:text="@string/autofill_save_yes">

            </Button>