diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/all_apps_fast_scroller.xml | 6 | ||||
| -rw-r--r-- | res/layout/all_apps_floating_header.xml | 6 | ||||
| -rw-r--r-- | res/layout/all_apps_rv_layout.xml | 2 | ||||
| -rw-r--r-- | res/layout/all_apps_tabs.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 7 |
5 files changed, 10 insertions, 14 deletions
diff --git a/res/layout/all_apps_fast_scroller.xml b/res/layout/all_apps_fast_scroller.xml index d858d3e21..5537bc60a 100644 --- a/res/layout/all_apps_fast_scroller.xml +++ b/res/layout/all_apps_fast_scroller.xml @@ -21,8 +21,8 @@ android:id="@+id/fast_scroller_popup" style="@style/FastScrollerPopup" android:layout_alignParentEnd="true" - android:layout_marginEnd="@dimen/fastscroll_popup_margin" - android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_margin" /> + android:layout_below="@+id/search_container_all_apps" + android:layout_marginEnd="@dimen/fastscroll_popup_margin" /> <com.android.launcher3.views.RecyclerViewFastScroller android:id="@+id/fast_scroller" @@ -30,8 +30,8 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" + android:layout_below="@+id/search_container_all_apps" android:layout_marginEnd="@dimen/fastscroll_end_margin" - android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_margin" launcher:canThumbDetach="true" /> </merge>
\ No newline at end of file diff --git a/res/layout/all_apps_floating_header.xml b/res/layout/all_apps_floating_header.xml index f88c60042..c4240f80d 100644 --- a/res/layout/all_apps_floating_header.xml +++ b/res/layout/all_apps_floating_header.xml @@ -18,10 +18,10 @@ android:id="@+id/all_apps_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_margin" + android:layout_below="@id/search_container_all_apps" android:clipToPadding="false" - android:orientation="vertical" - android:paddingTop="@dimen/all_apps_header_top_padding" > + android:paddingTop="@dimen/all_apps_header_top_padding" + android:orientation="vertical" > <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip android:id="@+id/tabs" diff --git a/res/layout/all_apps_rv_layout.xml b/res/layout/all_apps_rv_layout.xml index 8eba7fe3b..c353b361c 100644 --- a/res/layout/all_apps_rv_layout.xml +++ b/res/layout/all_apps_rv_layout.xml @@ -19,7 +19,7 @@ android:id="@+id/apps_list_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_margin" + android:layout_below="@id/search_container_all_apps" android:clipToPadding="false" android:descendantFocusability="afterDescendants" android:focusable="true" /> diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml index fea2eeae3..2accd2d21 100644 --- a/res/layout/all_apps_tabs.xml +++ b/res/layout/all_apps_tabs.xml @@ -20,8 +20,9 @@ android:id="@+id/all_apps_tabs_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_below="@id/search_container_all_apps" android:layout_gravity="center_horizontal|top" - android:layout_marginTop="@dimen/all_apps_tabs_top_margin" + android:layout_marginTop="@dimen/all_apps_header_tab_height" android:clipChildren="true" android:clipToPadding="false" android:descendantFocusability="afterDescendants" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b7e7ca1d2..f8f9c2ae9 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -95,12 +95,7 @@ <dimen name="all_apps_divider_margin_vertical">8dp</dimen> - <!-- Derived dimens --> - <dimen name="all_apps_search_bar_field_height_and_margin">56dp</dimen> - <!-- all_apps_search_bar_field_height_and_margin + all_apps_header_tab_height --> - <dimen name="all_apps_tabs_top_margin">106dp</dimen> - - <!-- Widget tray --> +<!-- Widget tray --> <dimen name="widget_preview_label_vertical_padding">8dp</dimen> <dimen name="widget_preview_label_horizontal_padding">16dp</dimen> |