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

Commit 5c1d3e96 authored by tmfang's avatar tmfang
Browse files

Make filter appear floating in ManagerApplication. 

Using new layouts to make filter component appear
floating on top of the page.

The layouts contain the NestedScollView and AppBarLayout.
The NestedScrollView was given a layout_behavior which
defined the behavior of AppBarLayout.

Test: visual
Change-Id: Ia76104f80c6b60ac6c8f5937ebface8e9a7238b5
Fixes: 121148001
parent 577f89de

res/layout/manage_applications_apps.xml

+51 −38
Original line number Diff line number Diff line
@@ -14,17 +14,23 @@ 
     limitations under the License.

-->



<LinearLayout

<androidx.coordinatorlayout.widget.CoordinatorLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <androidx.core.widget.NestedScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true"

        settings:layout_behavior="com.android.settings.widget.FloatingAppBarScrollingViewBehavior">



        <FrameLayout

            android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">

            android:layout_height="match_parent"

            android:paddingTop="@dimen/app_bar_height">



            <LinearLayout

                android:id="@+id/list_container"
@@ -33,15 +39,9 @@ 
                android:orientation="vertical"

                android:visibility="gone">



            <FrameLayout

                android:id="@+id/pinned_header"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



                <FrameLayout

                    android:layout_width="match_parent"

                android:layout_height="0px"

                android:layout_weight="1">

                    android:layout_height="match_parent">



                    <androidx.recyclerview.widget.RecyclerView

                        android:id="@+id/apps_list"
@@ -58,6 +58,7 @@ 
                        android:layout_width="match_parent"

                        android:layout_height="match_parent"

                        android:gravity="center"

                        android:layout_gravity="center"

                        android:text="@string/no_applications"

                        android:textAppearance="?android:attr/textAppearanceLarge"

                        android:visibility="invisible"/>
@@ -70,4 +71,16 @@ 


        </FrameLayout>



</LinearLayout>
 
    </androidx.core.widget.NestedScrollView>



    <com.google.android.material.appbar.AppBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        <FrameLayout

            android:id="@+id/pinned_header"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            settings:layout_scrollFlags="scroll|enterAlways"/>

    </com.google.android.material.appbar.AppBarLayout>



</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
    <dimen name="wifi_assistant_height">182dp</dimen>

    <dimen name="wifi_assistant_image_top">32dp</dimen>

    <dimen name="wifi_assistant_image_start">24dp</dimen>

    <!-- appbar height is equal search bar height (48dp) plus search bar top and bottom margin  -->

    <dimen name="app_bar_height">80dp</dimen>



    <!-- CryptKeeper top margin for password/pin screen -->

    <dimen name="crypt_keeper_password_top_margin">88dip</dimen>