| commit | bf8f1d76e7e6be21c0c045a709c2987ee30b3530 | [log] [tgz] |
|---|---|---|
| author | Alina Zaidi <alinazaidi@google.com> | Wed May 12 17:21:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 17:21:36 2021 +0000 |
| tree | 35e8f722f106fce6341cb924916ee2fbbe4c1ff6 | |
| parent | d9d988da8cccf5d90e201314410d3de27055a6ab [diff] | |
| parent | 3237236f26577395a545a0d5c67a846a8fa49968 [diff] |
Merge "Prevent cropping of personal/work tabs in full screen widget picker." into sc-dev am: 3237236f26 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14503978 Change-Id: I856b0bd7c8ef1da055cafe1c71c809b995fabcd0
diff --git a/res/layout/widgets_full_sheet_paged_view.xml b/res/layout/widgets_full_sheet_paged_view.xml index e3d34f6..580ca49 100644 --- a/res/layout/widgets_full_sheet_paged_view.xml +++ b/res/layout/widgets_full_sheet_paged_view.xml
@@ -38,8 +38,5 @@ </com.android.launcher3.workprofile.PersonalWorkPagedView> - <include layout="@layout/widgets_personal_work_tabs" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="16dp" /> + <include layout="@layout/widgets_personal_work_tabs"/> </merge> \ No newline at end of file
diff --git a/res/layout/widgets_personal_work_tabs.xml b/res/layout/widgets_personal_work_tabs.xml index 3402415..f835b52 100644 --- a/res/layout/widgets_personal_work_tabs.xml +++ b/res/layout/widgets_personal_work_tabs.xml
@@ -20,8 +20,7 @@ android:id="@+id/tabs" android:layout_width="match_parent" android:layout_height="@dimen/all_apps_header_pill_height" - android:layout_marginLeft="@dimen/all_apps_tabs_side_padding" - android:layout_marginRight="@dimen/all_apps_tabs_side_padding" + android:layout_marginHorizontal="16dp" android:orientation="horizontal" android:elevation="2dp" style="@style/TextHeadline">