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

Commit f99876e6 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Update layout for gesture navigation" into qt-dev

parents b37933aa f7b05c47

res/layout/drawer_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -61,12 +61,12 @@ 
                    android:layout_height="match_parent"/>

            </FrameLayout>



            <FrameLayout

            <androidx.coordinatorlayout.widget.CoordinatorLayout

                android:id="@+id/container_save"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="bottom|center_horizontal"

                android:background="?android:attr/colorBackground"

                android:background="?android:attr/colorBackgroundFloating"

                android:elevation="8dp" />



            <include layout="@layout/directory_app_bar"/>

res/layout/fixed_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ 
                    android:layout_height="0dp"

                    android:layout_weight="1" />



                <FrameLayout

                <androidx.coordinatorlayout.widget.CoordinatorLayout

                    android:id="@+id/container_save"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:background="?android:attr/colorBackground"

                    android:background="?android:attr/colorBackgroundFloating"

                    android:elevation="8dp" />



            </LinearLayout>

res/layout/fragment_pick.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    android:layout_width="match_parent"

    android:layout_height="@dimen/bottom_bar_height"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:baselineAligned="false"

    android:gravity="center_vertical|end"

res/layout/fragment_save.xml

+1 −2
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 


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

    android:layout_width="match_parent"

    android:layout_height="@dimen/bottom_bar_height"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/list_item_padding"

    android:paddingEnd="@dimen/bottom_bar_padding"

    android:orientation="horizontal"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    android:fitsSystemWindows="true"

    android:minHeight="?android:attr/listPreferredItemHeightSmall">



    <FrameLayout

res/layout/inspector_activity.xml

+3 −4
Original line number Diff line number Diff line
@@ -19,21 +19,18 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/inspector_root"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">

    android:layout_height="match_parent">



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

        android:id="@+id/app_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fitsSystemWindows="true"

        android:background="?android:colorBackground">



        <com.google.android.material.appbar.CollapsingToolbarLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="?android:attr/actionBarSize"

            android:fitsSystemWindows="true"

            app:titleEnabled="false"

            app:statusBarScrim="@android:color/transparent"

            app:layout_scrollFlags="scroll|exitUntilCollapsed">
@@ -71,10 +68,12 @@ 
        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:overScrollMode="never"

        app:behavior_overlapTop="10dp"

        app:layout_behavior="@string/appbar_scrolling_view_behavior">



        <LinearLayout

            android:id="@+id/inspector_container"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent"