diff options
author | 2025-03-13 20:31:23 -0700 | |
---|---|---|
committer | 2025-03-13 20:31:23 -0700 | |
commit | e1604abe849bae1601dd879ce2fb494702dac184 (patch) | |
tree | 9296925a2f4b46e632f79381979b3486574e05e8 | |
parent | 2d0669f14bf84d60bfcdc331d726178a7d573d4c (diff) | |
parent | 457113e03fc4cbe515a60b8a385f5cb8b4ad7a2e (diff) |
Merge "Update padding between picker / saver buttons to be total 8dp" into main
4 files changed, 8 insertions, 6 deletions
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp/fragment_save_cancel_button.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp/fragment_save_cancel_button.xml index e879b81ab..93245946c 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp/fragment_save_cancel_button.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp/fragment_save_cancel_button.xml @@ -21,6 +21,6 @@ app:cornerRadius="@dimen/button_corner_radius" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="4dp" - android:layout_marginEnd="4dp" + android:layout_marginStart="@dimen/picker_saver_button_gap" + android:layout_marginEnd="@dimen/picker_saver_button_gap" android:text="@android:string/cancel"/> diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml index a126492d0..3929ce505 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml @@ -51,7 +51,8 @@ android:layout_height="wrap_content" android:backgroundTint="@color/fragment_pick_button_background_color" android:textColor="@color/fragment_pick_button_text_color" - android:layout_marginEnd="4dp" /> + android:layout_marginStart="@dimen/picker_saver_button_gap" + android:layout_marginEnd="@dimen/picker_saver_button_gap" /> </LinearLayout> diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml index 416e4d6d2..3270b183c 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml @@ -38,6 +38,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_marginEnd="@dimen/picker_saver_button_gap" android:hint="@string/file_name_hint"> <com.google.android.material.textfield.TextInputEditText android:id="@android:id/title" @@ -55,8 +56,8 @@ app:cornerRadius="@dimen/button_corner_radius" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="4dp" - android:layout_marginEnd="4dp" + android:layout_marginStart="@dimen/picker_saver_button_gap" + android:layout_marginEnd="@dimen/picker_saver_button_gap" android:text="@string/menu_save"/> <com.google.android.material.progressindicator.CircularProgressIndicator diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml index b912c5d6c..10cb198d1 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml @@ -183,7 +183,7 @@ <dimen name="main_container_corner_radius_small">4dp</dimen> <dimen name="picker_saver_padding_top">@dimen/space_extra_small_1</dimen> <dimen name="picker_saver_padding_bottom">@dimen/space_extra_small_1</dimen> - <dimen name="picker_saver_button_gap">@dimen/space_extra_small_4</dimen> + <dimen name="picker_saver_button_gap">@dimen/space_extra_small_2</dimen> <dimen name="picker_saver_container_padding_top">@dimen/space_small_1</dimen> <dimen name="picker_saver_container_padding_bottom">@dimen/space_small_1</dimen> <dimen name="layout_padding_top">@dimen/space_small_1</dimen> |