Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adjust the bottom sheet and save UI" into tm-dev am: df12093fb4

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

Change-Id: Ib1e68caf92daa9941d0ef7c4c436b3d9ba0eeee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TYM Tsai
2022-06-09 17:52:06 +00:00
committed by Automerger Merge Worker
parent 09786d477c df12093fb4
commit 68adb63fe0
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/res/res/layout/autofill_fill_dialog.xml
View File

@@ -27,7 +27,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" 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_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:orientation="vertical"> android:orientation="vertical">
@@ -44,6 +45,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_marginTop="16dp"
android:paddingStart="@dimen/autofill_save_inner_padding" android:paddingStart="@dimen/autofill_save_inner_padding"
android:paddingEnd="@dimen/autofill_save_inner_padding" android:paddingEnd="@dimen/autofill_save_inner_padding"
android:visibility="gone" /> android:visibility="gone" />
@@ -55,38 +57,30 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:paddingStart="@dimen/autofill_save_inner_padding"
android:paddingEnd="@dimen/autofill_save_inner_padding"
android:visibility="gone" android:visibility="gone"
android:paddingBottom="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" 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 <ListView
android:id="@+id/autofill_dialog_list" android:id="@+id/autofill_dialog_list"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:paddingBottom="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:clipToPadding="false"
android:drawSelectorOnTop="true" android:drawSelectorOnTop="true"
android:clickable="true" android:clickable="true"
android:divider="@drawable/list_divider_material" android:divider="@null"
android:background="@drawable/autofill_dataset_picker_background"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout>
<com.android.internal.widget.ButtonBarLayout <com.android.internal.widget.ButtonBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="end" android:layout_gravity="end"
android:clipToPadding="false" android:layout_marginTop="8dp"
android:layout_marginTop="32dp"
android:layout_marginBottom="18dp" android:layout_marginBottom="18dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"

2
core/res/res/layout/autofill_save.xml
View File

@@ -29,7 +29,6 @@
android:layout_marginTop="@dimen/autofill_save_outer_top_margin" android:layout_marginTop="@dimen/autofill_save_outer_top_margin"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:elevation="@dimen/autofill_elevation"
android:background="?android:attr/colorSurface" android:background="?android:attr/colorSurface"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@@ -52,6 +51,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/autofill_save_title" android:text="@string/autofill_save_title"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:paddingBottom="24dp"
android:gravity="center" android:gravity="center"
android:textAppearance="@style/AutofillSaveUiTitle"> android:textAppearance="@style/AutofillSaveUiTitle">
</TextView> </TextView>

2
core/res/res/values/dimens.xml
View File

@@ -873,7 +873,7 @@
<dimen name="autofill_save_title_start_padding">8dp</dimen> <dimen name="autofill_save_title_start_padding">8dp</dimen>
<dimen name="autofill_save_scroll_view_top_margin">16dp</dimen> <dimen name="autofill_save_scroll_view_top_margin">16dp</dimen>
<dimen name="autofill_save_button_bar_padding">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 --> <!-- 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> <dimen name="autofill_save_custom_subtitle_max_height">20%</dimen>