diff options
author | 2024-08-20 00:40:56 +0000 | |
---|---|---|
committer | 2024-08-20 00:42:32 +0000 | |
commit | 8c965c67dc7b0b2f7219d50b2f1b95b59578d707 (patch) | |
tree | 5e7a2f4185076a9feaa707e43ee4fe5a96407f55 | |
parent | 64b0ad623a19c5498015ec47ba238d2d9c5851a3 (diff) |
Adjust tap target of the profile tabs in picker
Uses insets on background drawable to maintain visual size.
Bug: 360245807
Test: Accessibility scanner
Flag: EXEMPT bugfix
Change-Id: I1fbc7c2c782a1e331dd1ba77b0a3bf8aad277792
-rw-r--r-- | res/drawable/widget_picker_tabs_background.xml | 63 | ||||
-rw-r--r-- | res/layout/widgets_full_sheet_paged_view.xml | 2 | ||||
-rw-r--r-- | res/layout/widgets_two_pane_sheet_paged_view.xml | 2 |
3 files changed, 33 insertions, 34 deletions
diff --git a/res/drawable/widget_picker_tabs_background.xml b/res/drawable/widget_picker_tabs_background.xml index a874dd8b90..f6607b7ad1 100644 --- a/res/drawable/widget_picker_tabs_background.xml +++ b/res/drawable/widget_picker_tabs_background.xml @@ -13,36 +13,39 @@ See the License for the specific language governing permissions and limitations under the License. --> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/accent_ripple_color"> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:insetBottom="@dimen/widget_apps_tabs_vertical_padding" + android:insetTop="@dimen/widget_apps_tabs_vertical_padding"> + <ripple + android:color="@color/accent_ripple_color"> - <item android:id="@android:id/mask"> - <shape android:shape="rectangle"> - <corners android:radius="@dimen/all_apps_header_pill_corner_radius" /> - <solid android:color="@color/accent_ripple_color" /> - </shape> - </item> + <item android:id="@android:id/mask"> + <shape android:shape="rectangle"> + <corners android:radius="@dimen/all_apps_header_pill_corner_radius" /> + <solid android:color="@color/accent_ripple_color" /> + </shape> + </item> - <item> - <selector android:enterFadeDuration="100"> - <item - android:id="@+id/unselected" - android:state_selected="false"> - <shape android:shape="rectangle"> - <corners android:radius="@dimen/all_apps_header_pill_corner_radius" /> - <solid android:color="?attr/widgetPickerTabBackgroundUnselected"/> - </shape> - </item> + <item> + <selector android:enterFadeDuration="100"> + <item + android:id="@+id/unselected" + android:state_selected="false"> + <shape android:shape="rectangle"> + <corners android:radius="@dimen/all_apps_header_pill_corner_radius" /> + <solid android:color="?attr/widgetPickerTabBackgroundUnselected" /> + </shape> + </item> - <item - android:id="@+id/selected" - android:state_selected="true"> - <shape android:shape="rectangle"> - <corners android:radius="@dimen/all_apps_header_pill_corner_radius" /> - <solid android:color="?attr/widgetPickerTabBackgroundSelected"/> - </shape> - </item> - </selector> - </item> - -</ripple>
\ No newline at end of file + <item + android:id="@+id/selected" + android:state_selected="true"> + <shape android:shape="rectangle"> + <corners android:radius="@dimen/all_apps_header_pill_corner_radius" /> + <solid android:color="?attr/widgetPickerTabBackgroundSelected" /> + </shape> + </item> + </selector> + </item> + </ripple> +</inset>
\ No newline at end of file diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml index 8dc785af66..622f0d6aa5 100644 --- a/res/layout/widgets_full_sheet_paged_view.xml +++ b/res/layout/widgets_full_sheet_paged_view.xml @@ -104,7 +104,6 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding" - android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding" android:layout_weight="1" android:background="@drawable/widget_picker_tabs_background" android:text="@string/widgets_full_sheet_personal_tab" @@ -117,7 +116,6 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding" - android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding" android:layout_weight="1" android:background="@drawable/widget_picker_tabs_background" android:text="@string/widgets_full_sheet_work_tab" diff --git a/res/layout/widgets_two_pane_sheet_paged_view.xml b/res/layout/widgets_two_pane_sheet_paged_view.xml index 1f41680825..1cbd2bad43 100644 --- a/res/layout/widgets_two_pane_sheet_paged_view.xml +++ b/res/layout/widgets_two_pane_sheet_paged_view.xml @@ -115,7 +115,6 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding" - android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding" android:layout_weight="1" android:background="@drawable/widget_picker_tabs_background" android:text="@string/widgets_full_sheet_personal_tab" @@ -128,7 +127,6 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginEnd="@dimen/widget_tabs_button_horizontal_padding" - android:layout_marginVertical="@dimen/widget_apps_tabs_vertical_padding" android:layout_weight="1" android:background="@drawable/widget_picker_tabs_background" android:text="@string/widgets_full_sheet_work_tab" |