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

Commit 50de0797 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Use autofill specific dialog background" into tm-dev am: 7aee7c82 am:... 

Merge "Use autofill specific dialog background" into tm-dev am: 7aee7c82 am: 6cfe6e27 am: dc6baeb2

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



Change-Id: I553c782c44d95ecfb6e65410a60f9f8bde1e1f2b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17848a51 dc6baeb2

core/res/res/drawable/autofill_bottomsheet_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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 android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">

  <corners

      android:topLeftRadius="@dimen/autofill_dialog_corner_radius"

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

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

</shape>

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/autofill_dialog_corner_radius"

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

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

        android:topLeftRadius="@dimen/config_bottomDialogCornerRadius"

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

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

</shape>

core/res/res/layout/autofill_fill_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/autofill_dialog_picker"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/bottomsheet_background"

    android:background="@drawable/autofill_bottomsheet_background"

    android:orientation="vertical">



    <LinearLayout

core/res/res/layout/autofill_save.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +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:background="@drawable/autofill_bottomsheet_background"

    android:orientation="vertical">



    <LinearLayout