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

Commit 0fbc5826 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fill dialog/save ui style refinement" into tm-dev am: 0e0fd1d8 am: 5296ba27 

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



Change-Id: I1794cea370bb9ac6554d42db7785bb9c99f12502
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d0fcc46 5296ba27

core/res/res/layout/autofill_fill_dialog.xml

+15 −9
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ 
        android:layout_marginEnd="24dp"

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



    <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"
@@ -69,11 +76,10 @@ 
            android:layout_height="0dp"

            android:drawSelectorOnTop="true"

            android:clickable="true"

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

        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

            android:divider="@drawable/list_divider_material"

            android:background="@drawable/autofill_dataset_picker_background"

            android:visibility="gone"/>

    </LinearLayout>



    <com.android.internal.widget.ButtonBarLayout

        android:layout_width="match_parent"

core/res/res/layout/autofill_save.xml

+17 −26
Original line number Diff line number Diff line
@@ -23,46 +23,39 @@ 
    android:orientation="vertical">



    <LinearLayout

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

        android:id="@+id/autofill_save"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"

        android:paddingTop="@dimen/autofill_save_outer_top_padding"

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



        <LinearLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/autofill_save_inner_padding"

            android:paddingEnd="@dimen/autofill_save_inner_padding"

            android:orientation="vertical">



            <LinearLayout

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal">



            <ImageView

                android:id="@+id/autofill_save_icon"

                android:scaleType="fitStart"

                android:layout_gravity="center"

                android:layout_width="@dimen/autofill_save_icon_size"

                android:layout_height="@dimen/autofill_save_icon_size"/>



            <TextView

                android:id="@+id/autofill_save_title"

                    android:paddingStart="@dimen/autofill_save_title_start_padding"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:text="@string/autofill_save_title"

                    android:textAppearance="@style/TextAppearance.DeviceDefault.Subhead"

                    android:layout_weight="1">

                android:layout_marginTop="16dp"

                android:gravity="center"

                android:textAppearance="@style/AutofillSaveUiTitle">

            </TextView>



            </LinearLayout>



            <com.android.server.autofill.ui.CustomScrollView

                android:id="@+id/autofill_save_custom_subtitle"

                android:layout_width="match_parent"
@@ -79,8 +72,6 @@ 
            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">

core/res/res/values-night/themes_device_defaults.xml

+5 −0
Original line number Diff line number Diff line
@@ -98,5 +98,10 @@ easier. 
        <item name="colorAccentPrimary">@color/system_accent1_700</item>

        <item name="textColorPrimary">@color/system_neutral1_100</item>

        <item name="textColorSecondary">@color/system_neutral2_100</item>

        <item name="colorListDivider">@color/white</item>

    </style>



    <style name="Theme.DeviceDefault.AutofillHalfScreenDialogList" parent="Theme.DeviceDefault.DayNight">

        <item name="colorForeground">@android:color/white</item>

    </style>

</resources>

core/res/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -865,13 +865,13 @@ 
    <dimen name="autofill_dataset_picker_max_height">90%</dimen>



    <!-- Autofill save dialog padding -->

    <dimen name="autofill_save_outer_top_margin">32dp</dimen>

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

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

    <dimen name="autofill_elevation">32dp</dimen>

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

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

    <dimen name="autofill_save_icon_size">32dp</dimen>

    <dimen name="autofill_save_title_start_padding">8dp</dimen>

    <dimen name="autofill_save_scroll_view_top_margin">4dp</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>

core/res/res/values/styles.xml

+8 −1
Original line number Diff line number Diff line
@@ -1498,6 +1498,13 @@ please see styles_device_defaults.xml. 
        <item name="background">@drawable/autofill_dataset_picker_background</item>

    </style>



    <!-- @hide Autofill save dialog title -->

    <style name="AutofillSaveUiTitle" parent="TextAppearance.DeviceDefault.Subhead">

        <item name="textColor">?attr/textColorPrimary</item>

        <item name="fontFamily">google-sans</item>

        <item name="textSize">24sp</item>

    </style>



    <!--@hide -->

    <style name="AutofillHalfScreenAnimation">

        <item name="android:windowEnterAnimation">@anim/slide_in_up</item>