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

Commit b20ca7b8 authored by TYM Tsai's avatar TYM Tsai Committed by Automerger Merge Worker
Browse files

Merge "Adjust the bottom sheet and save UI" into tm-dev am: df12093f am: 68adb63f 

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



Change-Id: I298ac2c1e079233f03b8cf183b9f1a2a186250cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7544f10d 68adb63f

core/res/res/layout/autofill_fill_dialog.xml

+16 −22
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:paddingTop="24dp"

        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

        android:layout_marginBottom="24dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:orientation="vertical">
@@ -44,6 +45,7 @@ 
            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:layout_marginTop="16dp"

            android:paddingStart="@dimen/autofill_save_inner_padding"

            android:paddingEnd="@dimen/autofill_save_inner_padding"

            android:visibility="gone" />
@@ -55,38 +57,30 @@ 
        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:visibility="gone"

        android:paddingBottom="24dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

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

        android:layout_marginEnd="24dp" />



    <LinearLayout

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

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

        android:orientation="vertical">

    <ListView

        android:id="@+id/autofill_dialog_list"

        android:layout_weight="1"

        android:layout_width="fill_parent"

        android:layout_height="0dp"

        android:paddingBottom="24dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:clipToPadding="false"

        android:drawSelectorOnTop="true"

        android:clickable="true"

            android:divider="@drawable/list_divider_material"

            android:background="@drawable/autofill_dataset_picker_background"

        android:divider="@null"

        android:visibility="gone" />

    </LinearLayout>



    <com.android.internal.widget.ButtonBarLayout

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_gravity="end"

        android:clipToPadding="false"

        android:layout_marginTop="32dp"

        android:layout_marginTop="8dp"

        android:layout_marginBottom="18dp"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

core/res/res/layout/autofill_save.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:elevation="@dimen/autofill_elevation"

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

        android:gravity="center_horizontal"

        android:orientation="vertical">
@@ -52,6 +51,7 @@ 
                android:layout_height="wrap_content"

                android:text="@string/autofill_save_title"

                android:layout_marginTop="16dp"

                android:paddingBottom="24dp"

                android:gravity="center"

                android:textAppearance="@style/AutofillSaveUiTitle">

            </TextView>

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ 
    <dimen name="autofill_save_title_start_padding">8dp</dimen>

    <dimen name="autofill_save_scroll_view_top_margin">16dp</dimen>

    <dimen name="autofill_save_button_bar_padding">16dp</dimen>

    <dimen name="autofill_dialog_corner_radius">28dp</dimen>

    <dimen name="autofill_dialog_corner_radius">24dp</dimen>



    <!-- Max height of the the autofill save custom subtitle as a fraction of the screen width/height -->

    <dimen name="autofill_save_custom_subtitle_max_height">20%</dimen>