openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Using dimension instead of relyong on relativeLayout for view positions"" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2018-03-27 20:25:11 +00:00 committed by Android (Google) Code Review
parent 03ebe0cd00 a750730d90
commit 7d28623f3a
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/all_apps_fast_scroller.xml
View File

@ -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>

6
res/layout/all_apps_floating_header.xml
View File

@ -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"

2
res/layout/all_apps_rv_layout.xml
View File

@ -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" />

3
res/layout/all_apps_tabs.xml
View File

@ -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"

7
res/values/dimens.xml
View File

@ -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>