From 2979769b4183556c70487fa01bedcea161ff0916 Mon Sep 17 00:00:00 2001
From: Becky Zhou <huayinz@chromium.org>
Date: Tue, 11 Jun 2019 17:00:43 +0000
Subject: [PATCH] [Snowflake] Make button and chip widget min height 48dp

+ Add attribute "verticalInset" to specify the vertical inset of the
  background drawable of the widget
+ Adjust some vertical margins on button/chip usage

Bug: 902484
Change-Id: I7788c83519622b91ede8e3d44019c9ceedeac130
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1650205
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#668017}
---
 .../autofill_assistant_button_filled.xml      |  5 ++-
 .../autofill_assistant_button_hairline.xml    |  5 ++-
 .../layout/autofill_assistant_onboarding.xml  |  2 -
 .../java/res/values-v17/attrs.xml             |  1 +
 .../java/res/values-v17/dimens.xml            |  4 +-
 .../AssistantActionsCarouselCoordinator.java  |  3 +-
 .../carousel/ButtonView.java                  |  8 +++-
 .../res/layout/keyboard_accessory_action.xml  |  4 +-
 .../keyboard_accessory_action_modern.xml      |  5 +--
 .../res/layout/keyboard_accessory_chip.xml    |  8 ++--
 .../res/layout/keyboard_accessory_modern.xml  |  2 +-
 ...board_accessory_sheet_tab_address_info.xml | 16 +------
 ...d_accessory_sheet_tab_credit_card_info.xml |  6 +--
 ...oard_accessory_sheet_tab_password_info.xml |  6 +--
 .../layout/keyboard_accessory_suggestion.xml  |  2 -
 .../internal/java/res/values/dimens.xml       |  5 ++-
 .../bar_component/KeyboardAccessoryView.java  |  3 +-
 .../java/res/layout/account_signin_view.xml   |  6 +--
 .../layout/autofill_editor_base_buttons.xml   |  4 +-
 .../res/layout/button_preference_button.xml   |  1 -
 ...fault_search_engine_first_run_fragment.xml |  4 +-
 .../fre_data_reduction_proxy_lite_mode.xml    |  4 +-
 .../android/java/res/layout/fre_tosanduma.xml |  4 +-
 .../history_clear_browsing_data_header.xml    |  4 +-
 .../java/res/layout/item_chooser_dialog.xml   |  2 +-
 .../java/res/layout/modal_dialog_view.xml     |  5 ++-
 chrome/android/java/res/layout/page_info.xml  |  8 ++--
 .../res/layout/payment_request_bottom_bar.xml |  9 ++--
 .../personalized_signin_promo_view_body.xml   |  8 +---
 chrome/android/java/res/layout/snackbar.xml   |  2 +-
 .../java/res/layout/storage_preferences.xml   |  2 +
 .../android/java/res/layout/suspended_tab.xml |  3 +-
 chrome/android/java/res/values/dimens.xml     | 13 +++---
 .../browser/gesturenav/NavigationBubble.java  |  3 +-
 ui/android/java/res/values-v17/styles.xml     |  8 ++--
 ui/android/java/res/values/attrs.xml          |  8 ++++
 ui/android/java/res/values/dimens.xml         |  8 ++++
 .../org/chromium/ui/widget/ButtonCompat.java  |  7 +++-
 .../src/org/chromium/ui/widget/ChipView.java  |  4 +-
 .../ui/widget/RippleBackgroundHelper.java     | 42 ++++++++++++++-----
 40 files changed, 138 insertions(+), 106 deletions(-)

diff --git a/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_filled.xml b/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_filled.xml
index 3b56107a70945e..233aa1213bcdab 100644
--- a/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_filled.xml
+++ b/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_filled.xml
@@ -7,11 +7,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/autofill_assistant_button_height"
+    android:minHeight="@dimen/min_touch_target_size"
     app:chipColor="@color/filled_button_bg"
     app:rippleColor="@color/filled_button_ripple_color"
     app:cornerRadius="@dimen/autofill_assistant_button_corner_radius"
     app:primaryTextAppearance="@style/TextAppearance.WhiteButtonText"
     app:iconWidth="24dp"
     app:iconHeight="24dp"
-    app:chipBorderWidth="@dimen/autofill_assistant_filled_button_border_width"/>
+    app:chipBorderWidth="@dimen/autofill_assistant_filled_button_border_width"
+    app:verticalInset="@dimen/autofill_assistant_button_bg_vertical_inset" />
diff --git a/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_hairline.xml b/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_hairline.xml
index 11af3b35894a7b..341d8bce43f8de 100644
--- a/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_hairline.xml
+++ b/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_button_hairline.xml
@@ -7,10 +7,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/autofill_assistant_button_height"
+    android:minHeight="@dimen/min_touch_target_size"
     style="@style/AssistiveChip"
     app:chipColor="@color/default_text_color_inverse"
     app:cornerRadius="@dimen/autofill_assistant_button_corner_radius"
     app:iconWidth="24dp"
-    app:iconHeight="24dp"/>
+    app:iconHeight="24dp"
+    app:verticalInset="@dimen/autofill_assistant_button_bg_vertical_inset" />
 
diff --git a/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_onboarding.xml b/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_onboarding.xml
index b5e7eae749a6ff..29f09ae1f4fafc 100644
--- a/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_onboarding.xml
+++ b/chrome/android/features/autofill_assistant/java/res/layout/autofill_assistant_onboarding.xml
@@ -103,7 +103,6 @@
         android:id="@+id/button_init_not_ok"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="36dp"
         android:minWidth="120dp"
         android:singleLine="true"
         android:gravity="center"
@@ -120,7 +119,6 @@
         android:id="@+id/button_init_ok"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="36dp"
         android:minWidth="120dp"
         android:singleLine="true"
         android:gravity="center"
diff --git a/chrome/android/features/autofill_assistant/java/res/values-v17/attrs.xml b/chrome/android/features/autofill_assistant/java/res/values-v17/attrs.xml
index c6abaade4a5b28..58829db00fe589 100644
--- a/chrome/android/features/autofill_assistant/java/res/values-v17/attrs.xml
+++ b/chrome/android/features/autofill_assistant/java/res/values-v17/attrs.xml
@@ -31,5 +31,6 @@
         <attr name="secondaryTextAppearance" format="reference"/>
         <attr name="rippleColor"/>
         <attr name="chipBorderWidth" format="reference"/>
+        <attr name="verticalInset"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/chrome/android/features/autofill_assistant/java/res/values-v17/dimens.xml b/chrome/android/features/autofill_assistant/java/res/values-v17/dimens.xml
index 8000fd362db3d3..216ec02f751405 100644
--- a/chrome/android/features/autofill_assistant/java/res/values-v17/dimens.xml
+++ b/chrome/android/features/autofill_assistant/java/res/values-v17/dimens.xml
@@ -11,8 +11,10 @@
     <dimen name="autofill_assistant_info_box_spacing">16dp</dimen>
     <dimen name="autofill_assistant_poodle_view_size">34dp</dimen>
     <dimen name="autofill_assistant_filled_button_border_width">0dp</dimen>
-    <dimen name="autofill_assistant_button_height">40dp</dimen>
     <dimen name="autofill_assistant_button_corner_radius">40dp</dimen>
+    <!-- Sets drawable inset to 4dp so that min height of the button background drawable is 40dp
+         while maintaining a 48dp min height of the button. -->
+    <dimen name="autofill_assistant_button_bg_vertical_inset">4dp</dimen>
     <dimen name="autofill_assistant_suggestions_spacing">16dp</dimen>
     <dimen name="autofill_assistant_actions_spacing">8dp</dimen>
     <dimen name="autofill_assistant_actions_shadow_width">8dp</dimen>
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java
index 5d8b7f6f8e5050..aa68516acbd6a3 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java
@@ -52,8 +52,7 @@ public AssistantActionsCarouselCoordinator(Context context, AssistantCarouselMod
         // height of the view. We add the sheet vertical spacing twice as the item decoration will
         // add this space above and below each chip.
         mView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                context.getResources().getDimensionPixelSize(
-                        R.dimen.autofill_assistant_button_height)
+                context.getResources().getDimensionPixelSize(R.dimen.min_touch_target_size)
                         + 2
                                 * context.getResources().getDimensionPixelSize(
                                         org.chromium.chrome.autofill_assistant.R.dimen
diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/ButtonView.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/ButtonView.java
index 8a07831a80b3ff..172737db352e55 100644
--- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/ButtonView.java
+++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/ButtonView.java
@@ -78,6 +78,9 @@ private ButtonView(Context context, AttributeSet attrs, @StyleRes int themeOverl
                 org.chromium.chrome.R.style.TextAppearance_ChipText);
         int borderWidth = a.getResourceId(R.styleable.ButtonView_chipBorderWidth,
                 org.chromium.chrome.R.dimen.chip_border_width);
+        int verticalInset = a.getDimensionPixelSize(R.styleable.ButtonView_verticalInset,
+                getResources().getDimensionPixelSize(
+                        org.chromium.ui.R.dimen.chip_bg_vertical_inset));
         a.recycle();
 
         mIcon = new ChromeImageView(getContext());
@@ -94,8 +97,9 @@ private ButtonView(Context context, AttributeSet attrs, @StyleRes int themeOverl
         setPrimaryTextMargins(4);
 
         // Reset icon and background:
-        mRippleBackgroundHelper = new RippleBackgroundHelper(this, chipColorId, rippleColorId,
-                cornerRadius, org.chromium.chrome.R.color.chip_stroke_color, borderWidth);
+        mRippleBackgroundHelper =
+                new RippleBackgroundHelper(this, chipColorId, rippleColorId, cornerRadius,
+                        org.chromium.chrome.R.color.chip_stroke_color, borderWidth, verticalInset);
         setIcon(INVALID_ICON_ID, false);
     }
 
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action.xml
index da345ac1919e6f..da7a6d299f23d9 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action.xml
@@ -6,11 +6,9 @@
 <org.chromium.ui.widget.ButtonCompat
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:gravity="center"
-    android:layout_height="@dimen/keyboard_accessory_bar_item_height"
+    android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:paddingEnd="@dimen/keyboard_accessory_suggestion_padding"
     android:paddingStart="@dimen/keyboard_accessory_suggestion_padding"
-    android:layout_marginBottom="@dimen/keyboard_accessory_half_padding"
-    android:layout_marginTop="@dimen/keyboard_accessory_half_padding"
     android:textAlignment="center"
     style="@style/FilledButton.Flat" />
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action_modern.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action_modern.xml
index 918d9c976c2cfe..31a8353a0d5171 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action_modern.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_action_modern.xml
@@ -6,14 +6,11 @@
 <org.chromium.ui.widget.ButtonCompat
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:gravity="center"
-    android:layout_height="@dimen/keyboard_accessory_bar_item_height"
+    android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:minHeight="0dp"
     android:minWidth="0dp"
     android:paddingEnd="@dimen/keyboard_accessory_suggestion_padding"
     android:paddingStart="@dimen/keyboard_accessory_suggestion_padding"
-    android:layout_marginBottom="@dimen/keyboard_accessory_half_padding"
-    android:layout_marginTop="@dimen/keyboard_accessory_half_padding"
     android:layout_marginEnd="@dimen/keyboard_accessory_bar_item_padding"
     android:textAlignment="center"
     style="@style/FilledButton.Flat" />
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_chip.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_chip.xml
index 92a1b80e020a3a..97e1545e5ff12d 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_chip.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_chip.xml
@@ -13,11 +13,11 @@
     android:minHeight="0dp"
     android:minWidth="0dp"
     android:paddingBottom="0dp"
-    android:paddingEnd="@dimen/keyboard_accessory_half_padding"
-    android:paddingStart="@dimen/keyboard_accessory_half_padding"
+    android:paddingEnd="@dimen/keyboard_accessory_horizontal_padding"
+    android:paddingStart="@dimen/keyboard_accessory_horizontal_padding"
     android:paddingTop="0dp"
-    android:layout_marginBottom="@dimen/keyboard_accessory_half_padding"
-    android:layout_marginTop="@dimen/keyboard_accessory_half_padding"
+    android:layout_marginBottom="@dimen/keyboard_accessory_chip_vertical_margin"
+    android:layout_marginTop="@dimen/keyboard_accessory_chip_vertical_margin"
     android:elevation="2dp"
     android:textAppearance="@style/TextAppearance.BlackTitle2"
     android:background="@drawable/autofill_chip_inset"/>
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_modern.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_modern.xml
index 9f4ab029aa00cb..ae51e39e178f70 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_modern.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_modern.xml
@@ -30,7 +30,7 @@
     <LinearLayout
         android:id="@+id/accessory_bar_contents"
         android:layout_width="match_parent"
-        android:minHeight="@dimen/keyboard_accessory_bar_item_height"
+        android:minHeight="@dimen/keyboard_accessory_height"
         android:layout_height="wrap_content"
         android:layout_gravity="start|bottom"
         android:orientation="horizontal"
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_address_info.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_address_info.xml
index 25b1ddf19ab91e..fcac328ffc7b1b 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_address_info.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_address_info.xml
@@ -12,15 +12,13 @@
     android:paddingStart="@dimen/keyboard_accessory_suggestion_padding"
     android:paddingEnd="@dimen/keyboard_accessory_suggestion_padding"
     android:layout_marginTop="@dimen/keyboard_accessory_sheet_top_margin"
-    android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
+    android:layout_marginBottom="@dimen/keyboard_accessory_sheet_bottom_margin"
     android:orientation="vertical">
 
     <LinearLayout
         android:gravity="center_vertical|start"
         android:fillViewport="true"
         android:layout_height="@dimen/keyboard_accessory_suggestion_height"
-        android:paddingTop="@dimen/keyboard_accessory_sheet_padding"
-        android:paddingBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
@@ -50,8 +48,6 @@
     <org.chromium.ui.widget.ChipView
         android:id="@+id/company_name"
         android:gravity="center_vertical|start"
-        android:layout_marginTop="@dimen/keyboard_accessory_sheet_padding"
-        android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/InputChip" />
@@ -59,8 +55,6 @@
     <org.chromium.ui.widget.ChipView
         android:id="@+id/address_home_line_1"
         android:gravity="center_vertical|start"
-        android:layout_marginTop="@dimen/keyboard_accessory_sheet_padding"
-        android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/InputChip" />
@@ -68,8 +62,6 @@
     <org.chromium.ui.widget.ChipView
         android:id="@+id/address_home_line_2"
         android:gravity="center_vertical|start"
-        android:layout_marginTop="@dimen/keyboard_accessory_sheet_padding"
-        android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/InputChip" />
@@ -78,8 +70,6 @@
         android:gravity="center_vertical|start"
         android:fillViewport="true"
         android:layout_height="@dimen/keyboard_accessory_suggestion_height"
-        android:paddingTop="@dimen/keyboard_accessory_sheet_padding"
-        android:paddingBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
@@ -116,8 +106,6 @@
     <org.chromium.ui.widget.ChipView
         android:id="@+id/phone_home_whole_number"
         android:gravity="center_vertical|start"
-        android:layout_marginTop="@dimen/keyboard_accessory_sheet_padding"
-        android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/InputChip" />
@@ -125,8 +113,6 @@
     <org.chromium.ui.widget.ChipView
         android:id="@+id/email_address"
         android:gravity="center_vertical|start"
-        android:layout_marginTop="@dimen/keyboard_accessory_sheet_padding"
-        android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/InputChip" />
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_credit_card_info.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_credit_card_info.xml
index 7da04b9a1f73ac..ee24da8d1309b0 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_credit_card_info.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_credit_card_info.xml
@@ -13,15 +13,13 @@
     android:paddingStart="@dimen/keyboard_accessory_suggestion_padding"
     android:paddingEnd="@dimen/keyboard_accessory_suggestion_padding"
     android:layout_marginTop="@dimen/keyboard_accessory_sheet_top_margin"
-    android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
+    android:layout_marginBottom="@dimen/keyboard_accessory_sheet_bottom_margin"
     android:orientation="horizontal">
 
     <LinearLayout
         android:gravity="center_vertical|start"
         android:fillViewport="true"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/keyboard_accessory_sheet_padding"
-        android:paddingBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:orientation="vertical">
@@ -37,8 +35,6 @@
             android:gravity="center_vertical|start"
             android:fillViewport="true"
             android:layout_height="@dimen/keyboard_accessory_suggestion_height"
-            android:paddingTop="@dimen/keyboard_accessory_sheet_padding"
-            android:paddingBottom="@dimen/keyboard_accessory_sheet_padding"
             android:layout_width="match_parent"
             android:orientation="horizontal">
 
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_password_info.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_password_info.xml
index 053f28bd69c41e..87ad1f852276cf 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_password_info.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_sheet_tab_password_info.xml
@@ -12,7 +12,7 @@
     android:paddingStart="@dimen/keyboard_accessory_suggestion_padding"
     android:paddingEnd="@dimen/keyboard_accessory_suggestion_padding"
     android:layout_marginTop="@dimen/keyboard_accessory_sheet_top_margin"
-    android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
+    android:layout_marginBottom="@dimen/keyboard_accessory_sheet_bottom_margin"
     android:orientation="vertical">
 
 
@@ -20,8 +20,6 @@
         android:gravity="center_vertical|start"
         android:fillViewport="true"
         android:layout_height="@dimen/keyboard_accessory_suggestion_height"
-        android:paddingTop="@dimen/keyboard_accessory_sheet_padding"
-        android:paddingBottom="@dimen/keyboard_accessory_sheet_padding"
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
@@ -51,8 +49,6 @@
         android:gravity="center_vertical|start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/keyboard_accessory_sheet_padding"
-        android:layout_marginBottom="@dimen/keyboard_accessory_sheet_padding"
         style="@style/InputChip" />
 
 </org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.PasswordAccessoryInfoView>
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_suggestion.xml b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_suggestion.xml
index 84f19bbc21b594..0012c9591aeb44 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_suggestion.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/layout/keyboard_accessory_suggestion.xml
@@ -9,7 +9,5 @@
     android:gravity="center"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:layout_marginBottom="@dimen/keyboard_accessory_suggestion_top_bottom_margin"
-    android:layout_marginTop="@dimen/keyboard_accessory_suggestion_top_bottom_margin"
     app:iconWidth="@dimen/keyboard_accessory_bar_item_cc_icon_width"
     style="@style/AssistiveChip" />
diff --git a/chrome/android/features/keyboard_accessory/internal/java/res/values/dimens.xml b/chrome/android/features/keyboard_accessory/internal/java/res/values/dimens.xml
index 4e9b898c126459..39fa8650d74807 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/res/values/dimens.xml
+++ b/chrome/android/features/keyboard_accessory/internal/java/res/values/dimens.xml
@@ -7,16 +7,17 @@
     <!-- Autofill keyboard accessory dimensions -->
     <dimen name="keyboard_accessory_bar_item_height">36dp</dimen>
     <dimen name="keyboard_accessory_bar_item_padding">8dp</dimen>
-    <dimen name="keyboard_accessory_half_padding">6dp</dimen>
+    <dimen name="keyboard_accessory_horizontal_padding">6dp</dimen>
     <dimen name="keyboard_accessory_height">48dp</dimen>
     <!--dimen name="keyboard_accessory_height_with_shadow">56dp</dimen-->
     <dimen name="keyboard_accessory_image_top_padding">12dp</dimen>
     <dimen name="keyboard_accessory_shadow">5dp</dimen>
+    <dimen name="keyboard_accessory_chip_vertical_margin">8dp</dimen>
     <!--dimen name="keyboard_accessory_sheet_height">330dp</dimen-->
     <dimen name="keyboard_accessory_sheet_padding">8dp</dimen>
     <dimen name="keyboard_accessory_sheet_top_margin">16dp</dimen>
+    <dimen name="keyboard_accessory_sheet_bottom_margin">8dp</dimen>
     <dimen name="keyboard_accessory_suggestion_padding">16dp</dimen>
-    <dimen name="keyboard_accessory_suggestion_top_bottom_margin">8dp</dimen>
     <dimen name="keyboard_accessory_suggestion_offset">12dp</dimen>
     <dimen name="keyboard_accessory_suggestion_height">48dp</dimen>
     <dimen name="keyboard_accessory_suggestion_icon_size">20dp</dimen>
diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryView.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryView.java
index 3ba06722c90bb5..8d88420e47f360 100644
--- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryView.java
+++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryView.java
@@ -122,7 +122,8 @@ private void initializeHorizontalRecyclerView(RecyclerView recyclerView) {
         recyclerView.setLayoutManager(
                 new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
 
-        int pad = getResources().getDimensionPixelSize(R.dimen.keyboard_accessory_half_padding);
+        int pad =
+                getResources().getDimensionPixelSize(R.dimen.keyboard_accessory_horizontal_padding);
         // Create margins between every element.
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY)) {
             recyclerView.addItemDecoration(new HorizontalDividerItemDecoration(pad));
diff --git a/chrome/android/java/res/layout/account_signin_view.xml b/chrome/android/java/res/layout/account_signin_view.xml
index 359b84338c2432..0eae8c6a3902ba 100644
--- a/chrome/android/java/res/layout/account_signin_view.xml
+++ b/chrome/android/java/res/layout/account_signin_view.xml
@@ -186,7 +186,7 @@
         <org.chromium.ui.widget.ButtonCompat
             android:id="@+id/negative_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:paddingStart="@dimen/fre_button_padding"
             android:paddingEnd="@dimen/fre_button_padding"
             style="@style/TextButton" />
@@ -201,7 +201,7 @@
         <org.chromium.ui.widget.ButtonCompat
             android:id="@+id/positive_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:paddingStart="@dimen/fre_button_padding"
             android:paddingEnd="@dimen/fre_button_padding"
             style="@style/FilledButton.Flat" />
@@ -209,7 +209,7 @@
         <org.chromium.ui.widget.ButtonCompat
             android:id="@+id/more_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="wrap_content"
             android:drawableEnd="@drawable/down_arrow"
             android:drawablePadding="8dp"
             android:visibility="gone"
diff --git a/chrome/android/java/res/layout/autofill_editor_base_buttons.xml b/chrome/android/java/res/layout/autofill_editor_base_buttons.xml
index 926edb90509b01..48f8327d17fba6 100644
--- a/chrome/android/java/res/layout/autofill_editor_base_buttons.xml
+++ b/chrome/android/java/res/layout/autofill_editor_base_buttons.xml
@@ -16,8 +16,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/pref_autofill_field_horizontal_padding"
         android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding"
-        android:paddingTop="@dimen/editor_dialog_section_large_spacing"
-        android:paddingBottom="@dimen/editor_dialog_section_large_spacing"
+        android:paddingTop="@dimen/editor_dialog_section_buttons_vertical_padding"
+        android:paddingBottom="@dimen/editor_dialog_section_buttons_vertical_padding"
         android:background="@color/modern_primary_color"
         app:stackedMargin="@dimen/infobar_margin_between_stacked_buttons"
         app:primaryButtonText="@string/done"
diff --git a/chrome/android/java/res/layout/button_preference_button.xml b/chrome/android/java/res/layout/button_preference_button.xml
index 29a58071f70dfd..f1fdeecef95cd1 100644
--- a/chrome/android/java/res/layout/button_preference_button.xml
+++ b/chrome/android/java/res/layout/button_preference_button.xml
@@ -11,6 +11,5 @@
     android:id="@+id/button_preference"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:minHeight="40dp"
     android:focusable="false"
     style="@style/FilledButton" />
diff --git a/chrome/android/java/res/layout/default_search_engine_first_run_fragment.xml b/chrome/android/java/res/layout/default_search_engine_first_run_fragment.xml
index 2e9df331fe0796..ce0662fb20015d 100644
--- a/chrome/android/java/res/layout/default_search_engine_first_run_fragment.xml
+++ b/chrome/android/java/res/layout/default_search_engine_first_run_fragment.xml
@@ -69,9 +69,9 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/button_primary"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="end"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="10dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="22dp"
         android:paddingStart="@dimen/fre_button_padding"
diff --git a/chrome/android/java/res/layout/fre_data_reduction_proxy_lite_mode.xml b/chrome/android/java/res/layout/fre_data_reduction_proxy_lite_mode.xml
index ac0c95cbf19cb2..aabc00d1a38181 100644
--- a/chrome/android/java/res/layout/fre_data_reduction_proxy_lite_mode.xml
+++ b/chrome/android/java/res/layout/fre_data_reduction_proxy_lite_mode.xml
@@ -83,8 +83,8 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/next_button"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_marginBottom="16dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
         android:layout_gravity="bottom|center_horizontal"
         android:paddingStart="@dimen/fre_button_padding"
         android:paddingEnd="@dimen/fre_button_padding"
diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
index 2ef4e394ef3e79..c5a64da4e567b9 100644
--- a/chrome/android/java/res/layout/fre_tosanduma.xml
+++ b/chrome/android/java/res/layout/fre_tosanduma.xml
@@ -80,8 +80,8 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/terms_accept"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_marginBottom="16dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
         android:layout_gravity="bottom|center_horizontal"
         android:paddingStart="@dimen/fre_button_padding"
         android:paddingEnd="@dimen/fre_button_padding"
diff --git a/chrome/android/java/res/layout/history_clear_browsing_data_header.xml b/chrome/android/java/res/layout/history_clear_browsing_data_header.xml
index d2bec894305363..6b7d4a7b61eb29 100644
--- a/chrome/android/java/res/layout/history_clear_browsing_data_header.xml
+++ b/chrome/android/java/res/layout/history_clear_browsing_data_header.xml
@@ -6,8 +6,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:paddingBottom="8dp" >
+    android:paddingBottom="8dp">
 
         <!-- Sets edge padding separately because android:padding doesn't override
              android:paddingStart. -->
@@ -22,6 +23,7 @@
             android:paddingEnd="@dimen/list_item_default_margin"
             android:gravity="center_vertical|start"
             android:text="@string/open_clear_browsing_data_dialog_button"
+            app:verticalInset="0dp"
             style="@style/TextButton" />
 
         <View style="@style/HorizontalDivider" />
diff --git a/chrome/android/java/res/layout/item_chooser_dialog.xml b/chrome/android/java/res/layout/item_chooser_dialog.xml
index 118a82c29b4e08..a237f83e4d2868 100644
--- a/chrome/android/java/res/layout/item_chooser_dialog.xml
+++ b/chrome/android/java/res/layout/item_chooser_dialog.xml
@@ -74,7 +74,7 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="end"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="6dp"
         android:layout_marginEnd="12dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
diff --git a/chrome/android/java/res/layout/modal_dialog_view.xml b/chrome/android/java/res/layout/modal_dialog_view.xml
index 4f990e9ea9eaa0..cdc630d79bfde3 100644
--- a/chrome/android/java/res/layout/modal_dialog_view.xml
+++ b/chrome/android/java/res/layout/modal_dialog_view.xml
@@ -52,7 +52,10 @@
         android:id="@+id/button_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/modal_dialog_control_padding"
+        android:paddingTop="@dimen/modal_dialog_control_vertical_padding"
+        android:paddingBottom="@dimen/modal_dialog_control_vertical_padding"
+        android:paddingStart="@dimen/modal_dialog_control_horizontal_padding"
+        android:paddingEnd="@dimen/modal_dialog_control_horizontal_padding"
         app:stackedMargin="@dimen/button_bar_stacked_margin"
         app:buttonAlignment="end">
 
diff --git a/chrome/android/java/res/layout/page_info.xml b/chrome/android/java/res/layout/page_info.xml
index dbe14e94d7aaaf..faa040f2e3f5c5 100644
--- a/chrome/android/java/res/layout/page_info.xml
+++ b/chrome/android/java/res/layout/page_info.xml
@@ -108,11 +108,11 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/page_info_site_settings_button"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/page_info_popup_button_height"
+        android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_marginEnd="@dimen/page_info_popup_padding_sides"
         android:layout_marginStart="@dimen/page_info_popup_padding_sides"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="2dp"
         android:paddingEnd="@dimen/page_info_popup_button_padding_sides"
         android:paddingStart="@dimen/page_info_popup_button_padding_sides"
         android:text="@string/page_info_site_settings_button"
@@ -121,11 +121,11 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/page_info_open_online_button"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/page_info_popup_button_height"
+        android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_marginEnd="@dimen/page_info_popup_padding_sides"
         android:layout_marginStart="@dimen/page_info_popup_padding_sides"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="2dp"
         android:paddingEnd="@dimen/page_info_popup_button_padding_sides"
         android:paddingStart="@dimen/page_info_popup_button_padding_sides"
         android:text="@string/page_info_open_online_button"
diff --git a/chrome/android/java/res/layout/payment_request_bottom_bar.xml b/chrome/android/java/res/layout/payment_request_bottom_bar.xml
index 7e29649bc8f54c..f91344db84892a 100644
--- a/chrome/android/java/res/layout/payment_request_bottom_bar.xml
+++ b/chrome/android/java/res/layout/payment_request_bottom_bar.xml
@@ -10,7 +10,10 @@
     android:id="@+id/bottom_bar"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:padding="@dimen/editor_dialog_section_large_spacing"
+    android:paddingTop="@dimen/payments_request_bottom_bar_vertical_padding"
+    android:paddingBottom="@dimen/payments_request_bottom_bar_vertical_padding"
+    android:paddingStart="@dimen/payments_request_bottom_bar_horizontal_padding"
+    android:paddingEnd="@dimen/payments_request_bottom_bar_horizontal_padding"
     android:background="@color/payment_request_bg"
     android:visibility="gone" >
 
@@ -36,14 +39,14 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/button_secondary"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
+        android:layout_height="wrap_content"
         android:text="@string/payments_edit_button"
         style="@style/TextButton" />
 
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/button_primary"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
+        android:layout_height="wrap_content"
         android:text="@string/payments_pay_button"
         style="@style/FilledButton.Flat" />
 </org.chromium.chrome.browser.payments.ui.PaymentRequestBottomBar>
\ No newline at end of file
diff --git a/chrome/android/java/res/layout/personalized_signin_promo_view_body.xml b/chrome/android/java/res/layout/personalized_signin_promo_view_body.xml
index fc7d12b2aece66..69cbce42b5d062 100644
--- a/chrome/android/java/res/layout/personalized_signin_promo_view_body.xml
+++ b/chrome/android/java/res/layout/personalized_signin_promo_view_body.xml
@@ -22,11 +22,9 @@
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/signin_promo_signin_button"
         android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:layout_marginBottom="6dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="6dp"
         android:ellipsize="end"
         android:singleLine="true"
         android:text="@string/signin_promo_continue_as"
@@ -36,11 +34,9 @@
         android:id="@+id/signin_promo_choose_account_button"
         style="@style/SigninButtonBorderlessRegular"
         android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:layout_marginBottom="6dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="6dp"
         android:ellipsize="end"
         android:singleLine="true"
         android:text="@string/signin_promo_choose_account"/>
diff --git a/chrome/android/java/res/layout/snackbar.xml b/chrome/android/java/res/layout/snackbar.xml
index 4346c446968c65..f13fbc33a6eb57 100644
--- a/chrome/android/java/res/layout/snackbar.xml
+++ b/chrome/android/java/res/layout/snackbar.xml
@@ -73,7 +73,7 @@
         <org.chromium.ui.widget.ButtonCompat
             android:id="@+id/snackbar_button"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/snackbar_min_height"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:paddingEnd="24dp"
             android:paddingStart="24dp"
diff --git a/chrome/android/java/res/layout/storage_preferences.xml b/chrome/android/java/res/layout/storage_preferences.xml
index 5eecae7cfdfe9f..1eddfbb87a3ba2 100644
--- a/chrome/android/java/res/layout/storage_preferences.xml
+++ b/chrome/android/java/res/layout/storage_preferences.xml
@@ -6,6 +6,7 @@
 <!-- TODO(https://crbug.com/929743): Use standard layout and specify only bottom button here. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
@@ -44,5 +45,6 @@
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
         android:text="@string/storage_clear_button_title"
+        app:verticalInset="0dp"
         style="@style/TextButton" />
 </LinearLayout>
\ No newline at end of file
diff --git a/chrome/android/java/res/layout/suspended_tab.xml b/chrome/android/java/res/layout/suspended_tab.xml
index ec3a69da87287c..7e9ee89eaa1a99 100644
--- a/chrome/android/java/res/layout/suspended_tab.xml
+++ b/chrome/android/java/res/layout/suspended_tab.xml
@@ -7,7 +7,6 @@
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true">
@@ -58,10 +57,10 @@
             android:id="@+id/suspended_tab_settings_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="48dp"
             android:layout_gravity="end"
             android:gravity="center"
             android:text="@string/preferences"
+            app:verticalInset="0dp"
             style="@style/TextButton" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
index 0ef4e15280da37..ea718076b679f8 100644
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -10,7 +10,6 @@
 
     <!-- Page Info Popup Dimensions -->
     <dimen name="page_info_popup_padding_sides">16dp</dimen>
-    <dimen name="page_info_popup_button_height">36dp</dimen>
     <dimen name="page_info_popup_button_padding_sides">8dp</dimen>
     <dimen name="page_info_popup_permission_icon_size">24dp</dimen>
 
@@ -142,9 +141,6 @@
     <!-- Password generation dialog dimensions -->
     <dimen name="password_generation_dialog_padding">24dp</dimen>
 
-    <!-- Minimum height/width for a touchable item -->
-    <dimen name="min_touch_target_size">48dp</dimen>
-
     <!-- Promo dialogs -->
     <dimen name="promo_dialog_illustration_margin">24dp</dimen>
     <dimen name="promo_dialog_illustration_width">150dp</dimen>
@@ -204,7 +200,8 @@
     <dimen name="dialog_max_width">600dp</dimen>
 
     <!-- ModalDialogView dimensions -->
-    <dimen name="modal_dialog_control_padding">8dp</dimen>
+    <dimen name="modal_dialog_control_vertical_padding">2dp</dimen>
+    <dimen name="modal_dialog_control_horizontal_padding">8dp</dimen>
     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
 
     <!-- Tab Strip Dimensions -->
@@ -450,6 +447,7 @@
     <!-- Editor dialog UI -->
     <dimen name="editor_dialog_section_small_spacing">8dp</dimen>
     <dimen name="editor_dialog_section_large_spacing">16dp</dimen>
+    <dimen name="editor_dialog_section_buttons_vertical_padding">10dp</dimen>
     <dimen name="editable_option_section_logo_width">38dp</dimen>
 
     <!-- Payments UI
@@ -468,6 +466,8 @@
     <dimen name="payments_ui_translation">100dp</dimen>
     <dimen name="payments_favicon_size">24dp</dimen>
     <dimen name="payments_handler_window_minimum_height">500dp</dimen>
+    <dimen name="payments_request_bottom_bar_vertical_padding">10dp</dimen>
+    <dimen name="payments_request_bottom_bar_horizontal_padding">16dp</dimen>
 
     <!-- Preferences dimensions
          pref_autofill_field_horizontal_padding exists because TextInputLayouts have an internal
@@ -603,7 +603,8 @@
 
     <!-- History Navigation UI Item -->
     <dimen name="navigation_bubble_border_width">1dp</dimen>
-    <dimen name="navigation_bubble_default_height">32dp</dimen>
+    <dimen name="navigation_bubble_default_height">48dp</dimen>
+    <dimen name="navigation_bubble_bg_vertical_inset">8dp</dimen>
     <dimen name="navigation_bubble_vertical_padding">4dp</dimen>
     <dimen name="navigation_bubble_horizontal_padding">8dp</dimen>
     <dimen name="navigation_bubble_icon_size">20dp</dimen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java
index 3f366390945846..c354f3b4ba5d98 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationBubble.java
@@ -42,7 +42,8 @@ public NavigationBubble(Context context, AttributeSet attrs) {
         mRippleBackgroundHelper = new RippleBackgroundHelper(this,
                 R.color.navigation_bubble_background_color, R.color.navigation_bubble_ripple_color,
                 getResources().getDimensionPixelSize(R.dimen.navigation_bubble_default_height),
-                R.color.navigation_bubble_stroke_color, R.dimen.navigation_bubble_border_width);
+                R.color.navigation_bubble_stroke_color, R.dimen.navigation_bubble_border_width,
+                getResources().getDimensionPixelSize(R.dimen.navigation_bubble_bg_vertical_inset));
     }
 
     @Override
diff --git a/ui/android/java/res/values-v17/styles.xml b/ui/android/java/res/values-v17/styles.xml
index 0bd071599b0b7d..11c4ec2d6861e9 100644
--- a/ui/android/java/res/values-v17/styles.xml
+++ b/ui/android/java/res/values-v17/styles.xml
@@ -23,8 +23,8 @@
     </style>
 
     <style name="ButtonCompatBase">
-        <item name="android:minWidth">88dp</item>
-        <item name="android:minHeight">36dp</item>
+        <item name="android:minWidth">@dimen/button_min_width</item>
+        <item name="android:minHeight">@dimen/min_touch_target_size</item>
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>
         <item name="android:paddingTop">5dp</item>
@@ -32,6 +32,7 @@
         <item name="android:focusable">true</item>
         <item name="android:clickable">true</item>
         <item name="android:gravity">center_vertical|center_horizontal</item>
+        <item name="verticalInset">@dimen/button_bg_vertical_inset</item>
     </style>
     <style name="FilledButton" parent="ButtonCompatBase" tools:ignore="UnusedResources">
         <item name="android:paddingStart">24dp</item>
@@ -59,11 +60,12 @@
     </style>
 
     <style name="Chip">
-        <item name="android:minHeight">@dimen/chip_default_height</item>
+        <item name="android:minHeight">@dimen/min_touch_target_size</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:orientation">horizontal</item>
         <item name="chipColor">@color/chip_background_color</item>
         <item name="rippleColor">@color/chip_ripple_color</item>
+        <item name="verticalInset">@dimen/chip_bg_vertical_inset</item>
     </style>
     <style name="SuggestionChip" parent="Chip" tools:ignore="UnusedResources">
         <item name="primaryTextAppearance">@style/TextAppearance.ChipText</item>
diff --git a/ui/android/java/res/values/attrs.xml b/ui/android/java/res/values/attrs.xml
index f82f8f00d1e09d..538638b586e526 100644
--- a/ui/android/java/res/values/attrs.xml
+++ b/ui/android/java/res/values/attrs.xml
@@ -3,7 +3,10 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 <resources>
+    <!-- The color of the ripple effect on clickable elements. -->
     <attr name="rippleColor" format="color"/>
+    <!-- The top or bottom inset of a drawable. -->
+    <attr name="verticalInset" format="reference|dimension"/>
 
     <declare-styleable name="DualControlLayout">
         <attr name="stackedMargin" format="reference"/>
@@ -17,9 +20,13 @@
     </declare-styleable>
 
     <declare-styleable name="ButtonCompat">
+        <!-- The color of the button background. -->
         <attr name="buttonColor" format="color"/>
         <attr name="rippleColor"/>
+        <!-- Whether the button is elevated. -->
         <attr name="buttonRaised" format="boolean"/>
+        <!-- The vertical inset of the button background drawable. -->
+        <attr name="verticalInset"/>
     </declare-styleable>
 
     <declare-styleable name="ChipView">
@@ -31,6 +38,7 @@
         <attr name="primaryTextAppearance" format="reference"/>
         <attr name="secondaryTextAppearance" format="reference"/>
         <attr name="rippleColor"/>
+        <attr name="verticalInset"/>
     </declare-styleable>
 
     <declare-styleable name="TextViewWithLeading">
diff --git a/ui/android/java/res/values/dimens.xml b/ui/android/java/res/values/dimens.xml
index 033503559b6572..7ba94dd3db38e4 100644
--- a/ui/android/java/res/values/dimens.xml
+++ b/ui/android/java/res/values/dimens.xml
@@ -23,12 +23,20 @@
     <item name="default_focused_alpha" format="float" type="dimen">0.06</item>
     <item name="default_hovered_alpha" format="float" type="dimen">0.04</item>
 
+    <!-- Minimum height/width for a touchable item -->
+    <dimen name="min_touch_target_size">48dp</dimen>
+
+    <!-- Button default measures -->
+    <dimen name="button_min_width">88dp</dimen>
+    <dimen name="button_bg_vertical_inset">6dp</dimen>
+
     <!-- Chips default measures -->
     <dimen name="chip_border_width">1dp</dimen>
     <dimen name="chip_corner_radius">8dp</dimen>
     <dimen name="chip_default_height">32dp</dimen>
     <dimen name="chip_end_padding">16dp</dimen>
     <dimen name="chip_element_leading_padding">8dp</dimen>
+    <dimen name="chip_bg_vertical_inset">8dp</dimen>
     <item name="chip_background_selected_focused_alpha" format="float" type="dimen">0.12</item>
     <item name="chip_background_selected_alpha" format="float" type="dimen">0.06</item>
     <dimen name="chip_icon_size">20dp</dimen>
diff --git a/ui/android/java/src/org/chromium/ui/widget/ButtonCompat.java b/ui/android/java/src/org/chromium/ui/widget/ButtonCompat.java
index f83ca7c1a9ce6a..970e088fc4d2c8 100644
--- a/ui/android/java/src/org/chromium/ui/widget/ButtonCompat.java
+++ b/ui/android/java/src/org/chromium/ui/widget/ButtonCompat.java
@@ -35,6 +35,8 @@
  *
  * Note: To ensure the button's shadow is fully visible, you may need to set
  * android:clipToPadding="false" on the button's parent view.
+ *
+ * See {@link R.styleable#ButtonCompat ButtonCompat Attributes}.
  */
 public class ButtonCompat extends AppCompatButton {
     private RippleBackgroundHelper mRippleBackgroundHelper;
@@ -66,10 +68,13 @@ private ButtonCompat(Context context, AttributeSet attrs, @StyleRes int themeOve
         int rippleColorId = a.getResourceId(
                 R.styleable.ButtonCompat_rippleColor, R.color.filled_button_ripple_color);
         boolean buttonRaised = a.getBoolean(R.styleable.ButtonCompat_buttonRaised, true);
+        int verticalInset = a.getDimensionPixelSize(R.styleable.ButtonCompat_verticalInset,
+                getResources().getDimensionPixelSize(R.dimen.button_bg_vertical_inset));
         a.recycle();
 
         mRippleBackgroundHelper = new RippleBackgroundHelper(this, buttonColorId, rippleColorId,
-                getResources().getDimensionPixelSize(R.dimen.button_compat_corner_radius));
+                getResources().getDimensionPixelSize(R.dimen.button_compat_corner_radius),
+                verticalInset);
         setRaised(buttonRaised);
     }
 
diff --git a/ui/android/java/src/org/chromium/ui/widget/ChipView.java b/ui/android/java/src/org/chromium/ui/widget/ChipView.java
index e01ae7bcd88841..de55d507434145 100644
--- a/ui/android/java/src/org/chromium/ui/widget/ChipView.java
+++ b/ui/android/java/src/org/chromium/ui/widget/ChipView.java
@@ -69,6 +69,8 @@ private ChipView(Context context, AttributeSet attrs, @StyleRes int themeOverlay
                 R.styleable.ChipView_primaryTextAppearance, R.style.TextAppearance_ChipText);
         mSecondaryTextAppearanceId = a.getResourceId(
                 R.styleable.ChipView_secondaryTextAppearance, R.style.TextAppearance_ChipText);
+        int verticalInset = a.getDimensionPixelSize(R.styleable.ChipView_verticalInset,
+                getResources().getDimensionPixelSize(R.dimen.chip_bg_vertical_inset));
         a.recycle();
 
         mIcon = new ChromeImageView(getContext());
@@ -85,7 +87,7 @@ private ChipView(Context context, AttributeSet attrs, @StyleRes int themeOverlay
 
         // Reset icon and background:
         mRippleBackgroundHelper = new RippleBackgroundHelper(this, chipColorId, rippleColorId,
-                cornerRadius, R.color.chip_stroke_color, R.dimen.chip_border_width);
+                cornerRadius, R.color.chip_stroke_color, R.dimen.chip_border_width, verticalInset);
         setIcon(INVALID_ICON_ID, false);
     }
 
diff --git a/ui/android/java/src/org/chromium/ui/widget/RippleBackgroundHelper.java b/ui/android/java/src/org/chromium/ui/widget/RippleBackgroundHelper.java
index b83b9556c1898e..b028425a74cf97 100644
--- a/ui/android/java/src/org/chromium/ui/widget/RippleBackgroundHelper.java
+++ b/ui/android/java/src/org/chromium/ui/widget/RippleBackgroundHelper.java
@@ -9,6 +9,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.InsetDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Build;
@@ -54,11 +55,13 @@ public class RippleBackgroundHelper {
      * @param backgroundColorResId The resource id of the background color.
      * @param rippleColorResId The resource id of the ripple color.
      * @param cornerRadius The corner radius in pixels of the background drawable.
+     * @param verticalInset The vertical inset of the background drawable.
      */
     RippleBackgroundHelper(View view, @ColorRes int backgroundColorResId,
-            @ColorRes int rippleColorResId, @Px int cornerRadius) {
+            @ColorRes int rippleColorResId, @Px int cornerRadius, @Px int verticalInset) {
         this(view, backgroundColorResId, rippleColorResId, cornerRadius,
-                android.R.color.transparent, R.dimen.default_ripple_background_border_size);
+                android.R.color.transparent, R.dimen.default_ripple_background_border_size,
+                verticalInset);
     }
 
     /**
@@ -68,12 +71,13 @@ public class RippleBackgroundHelper {
      * @param cornerRadius The corner radius in pixels of the background drawable.
      * @param borderColorResId The resource id of the border color.
      * @param borderSizeDimenId The resource id of the border size.
+     * @param verticalInset The vertical inset of the background drawable.
      */
     // TODO(jdemeulenaere): Make this constructor package-private once it is not accessed by {@link
     // org.chromium.chrome.browser.autofill_assistant.carousel.ButtonView} anymore.
     public RippleBackgroundHelper(View view, @ColorRes int backgroundColorResId,
             @ColorRes int rippleColorResId, @Px int cornerRadius, @ColorRes int borderColorResId,
-            @DimenRes int borderSizeDimenId) {
+            @DimenRes int borderSizeDimenId, @Px int verticalInset) {
         mView = view;
 
         int paddingStart = ViewCompat.getPaddingStart(mView);
@@ -83,7 +87,8 @@ public RippleBackgroundHelper(View view, @ColorRes int backgroundColorResId,
         mView.setBackground(createBackgroundDrawable(
                 AppCompatResources.getColorStateList(view.getContext(), rippleColorResId),
                 AppCompatResources.getColorStateList(view.getContext(), borderColorResId),
-                view.getResources().getDimensionPixelSize(borderSizeDimenId), cornerRadius));
+                view.getResources().getDimensionPixelSize(borderSizeDimenId), cornerRadius,
+                verticalInset));
         setBackgroundColor(
                 AppCompatResources.getColorStateList(view.getContext(), backgroundColorResId));
 
@@ -101,10 +106,12 @@ public RippleBackgroundHelper(View view, @ColorRes int backgroundColorResId,
      * @param borderColorList A {@link ColorStateList} that is used for the border.
      * @param borderSize The border width in pixels.
      * @param cornerRadius The corner radius in pixels.
+     * @param verticalInset The vertical inset of the background drawable.
      * @return The {@link GradientDrawable}/{@link LayerDrawable} to be used as ripple background.
      */
     private Drawable createBackgroundDrawable(ColorStateList rippleColorList,
-            ColorStateList borderColorList, @Px int borderSize, @Px int cornerRadius) {
+            ColorStateList borderColorList, @Px int borderSize, @Px int cornerRadius,
+            @Px int verticalInset) {
         mBackgroundGradient = new GradientDrawable();
         mBackgroundGradient.setCornerRadius(cornerRadius);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -112,8 +119,10 @@ private Drawable createBackgroundDrawable(ColorStateList rippleColorList,
             GradientDrawable mask = new GradientDrawable();
             mask.setCornerRadius(cornerRadius);
             mask.setColor(Color.WHITE);
-            return new RippleDrawable(
-                    convertToRippleDrawableColorList(rippleColorList), mBackgroundGradient, mask);
+            return wrapDrawableWithInsets(
+                    new RippleDrawable(convertToRippleDrawableColorList(rippleColorList),
+                            mBackgroundGradient, mask),
+                    verticalInset);
         }
 
         // Pre-L, create a background drawable and overlay it by a ripple drawable.
@@ -123,7 +132,9 @@ private Drawable createBackgroundDrawable(ColorStateList rippleColorList,
         mRippleDrawablePreL = DrawableCompat.wrap(rippleGradient);
         DrawableCompat.setTintList(mRippleDrawablePreL, rippleColorList);
         if (borderSize == 0) {
-            return new LayerDrawable(new Drawable[] {mBackgroundDrawablePreL, mRippleDrawablePreL});
+            return wrapDrawableWithInsets(new LayerDrawable(new Drawable[] {
+                                                  mBackgroundDrawablePreL, mRippleDrawablePreL}),
+                    verticalInset);
         }
 
         // If the background is overlaid by a border. The border is in a separate GradientDrawable
@@ -136,8 +147,19 @@ private Drawable createBackgroundDrawable(ColorStateList rippleColorList,
                         mView.getDrawableState(), borderColorList.getDefaultColor()));
         mBorderDrawablePreL = DrawableCompat.wrap(borderGradient);
         DrawableCompat.setTintList(mBorderDrawablePreL, borderColorList);
-        return new LayerDrawable(
-                new Drawable[] {mBackgroundDrawablePreL, mBorderDrawablePreL, mRippleDrawablePreL});
+        return wrapDrawableWithInsets(new LayerDrawable(new Drawable[] {mBackgroundDrawablePreL,
+                                              mBorderDrawablePreL, mRippleDrawablePreL}),
+                verticalInset);
+    }
+
+    /**
+     * @param drawable The {@link Drawable} that needs to be wrapped with insets.
+     * @param verticalInset The vertical inset for the specified drawable.
+     * @return A {@link Drawable} that wraps the specified drawable with the specified inset.
+     */
+    private static Drawable wrapDrawableWithInsets(Drawable drawable, @Px int verticalInset) {
+        if (verticalInset == 0) return drawable;
+        return new InsetDrawable(drawable, 0, verticalInset, 0, verticalInset);
     }
 
     /**