Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9623ed18 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

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
parent 52587f70

res/layout/all_apps_fast_scroller.xml

+3 −3
Original line number Diff line number Diff line
@@ -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

res/layout/all_apps_floating_header.xml

+3 −3
Original line number Diff line number Diff line
@@ -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"

res/layout/all_apps_rv_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

res/layout/all_apps_tabs.xml

+1 −2
Original line number Diff line number Diff line
@@ -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"

res/values/dimens.xml

+6 −1
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ 


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

    <dimen name="widget_preview_label_vertical_padding">8dp</dimen>

    <dimen name="widget_preview_label_horizontal_padding">16dp</dimen>