diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-03-22 14:40:53 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-03-22 14:42:00 -0700 |
commit | 9623ed1894829cb046db36c5bdab71d2bcc4bd51 (patch) | |
tree | e5fb699a41e2799b9ec509bce7872af38445471f /res/layout | |
parent | 52587f708f71eeebb8ae2c8c4427b6e72e89d824 (diff) | |
download | android_packages_apps_Trebuchet-9623ed1894829cb046db36c5bdab71d2bcc4bd51.tar.gz android_packages_apps_Trebuchet-9623ed1894829cb046db36c5bdab71d2bcc4bd51.tar.bz2 android_packages_apps_Trebuchet-9623ed1894829cb046db36c5bdab71d2bcc4bd51.zip |
Using dimension instead of relyong on relativeLayout for view positions
Search box can be hidden as a result of various state flags. But the dependent
views should still retain their positions
Change-Id: I820ac11d120f9c78a457e64f3f21d9e8ff3f6110
Diffstat (limited to 'res/layout')
-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 |
4 files changed, 8 insertions, 9 deletions
diff --git a/res/layout/all_apps_fast_scroller.xml b/res/layout/all_apps_fast_scroller.xml index 5537bc60a..d858d3e21 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_below="@+id/search_container_all_apps" - android:layout_marginEnd="@dimen/fastscroll_popup_margin" /> + android:layout_marginEnd="@dimen/fastscroll_popup_margin" + android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_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 c4240f80d..f88c60042 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_below="@id/search_container_all_apps" + android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_margin" android:clipToPadding="false" - android:paddingTop="@dimen/all_apps_header_top_padding" - android:orientation="vertical" > + android:orientation="vertical" + android:paddingTop="@dimen/all_apps_header_top_padding" > <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 c353b361c..8eba7fe3b 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_below="@id/search_container_all_apps" + android:layout_marginTop="@dimen/all_apps_search_bar_field_height_and_margin" 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 2accd2d21..fea2eeae3 100644 --- a/res/layout/all_apps_tabs.xml +++ b/res/layout/all_apps_tabs.xml @@ -20,9 +20,8 @@ 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_header_tab_height" + android:layout_marginTop="@dimen/all_apps_tabs_top_margin" android:clipChildren="true" android:clipToPadding="false" android:descendantFocusability="afterDescendants" |