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

Commit 724581f6 authored by Zemiao Zhu's avatar Zemiao Zhu
Browse files

Add shadow to top toolbar. 

To prevent visual glitch when entering selection mode,
we also need to update scroll flag of searchbar,
so that it cannot be scrolled out of screen now.

Bug: 168244886
Test: manual
Change-Id: Ia968ba2719c00ca9fe036ed5a94d2c29a5e2a143
parent cce7f88c

res/layout/directory_app_bar.xml

+3 −10
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ 


        </androidx.core.widget.NestedScrollView>



        <View

            android:id="@+id/toolbar_background_layout"

            android:layout_width="match_parent"

            android:layout_height="@dimen/action_bar_space_height"

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

            app:layout_collapseMode="pin"/>



        <androidx.appcompat.widget.Toolbar

            android:id="@+id/toolbar"

            android:layout_width="match_parent"
@@ -53,7 +46,7 @@ 
            android:background="?android:attr/colorBackground"

            android:theme="?actionBarTheme"

            android:popupTheme="?actionBarPopupTheme"

            android:elevation="3dp"

            android:elevation="@dimen/search_bar_elevation"

            app:collapseContentDescription="@string/button_back"

            app:titleTextAppearance="@style/ToolbarTitle"

            app:layout_collapseMode="pin">

res/layout/directory_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
    android:id="@+id/directory_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/action_bar_space_margin"

    android:orientation="vertical">



    <com.android.documentsui.HorizontalBreadcrumb

res/layout/drawer_layout.xml

+4 −11
Original line number Diff line number Diff line
@@ -38,20 +38,13 @@ 
                android:layout_height="match_parent"

                app:layout_behavior="@string/scrolling_behavior">



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:orientation="vertical">



                <FrameLayout

                    android:id="@+id/container_directory"

                    android:clipToPadding="false"

                    android:layout_width="match_parent"

                        android:layout_height="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="1" />



                </LinearLayout>



                <FrameLayout

                    android:id="@+id/container_search_fragment"

                    android:clipToPadding="false"

res/values-sw720dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -28,6 +28,4 @@ 
    <dimen name="search_bar_text_margin_start">55dp</dimen>

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

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



    <dimen name="action_bar_space_margin">0dp</dimen>

</resources>

res/values/dimens.xml

+4 −3
Original line number Diff line number Diff line
@@ -110,15 +110,16 @@ 
    <dimen name="apps_row_exit_icon_margin_bottom">6dp</dimen>

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



    <dimen name="search_bar_elevation">3dp</dimen>

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

    <dimen name="search_bar_background_margin_start">0dp</dimen>

    <dimen name="search_bar_background_margin_end">0dp</dimen>

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

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



    <dimen name="action_bar_elevation">3dp</dimen>

    <dimen name="action_bar_margin">1dp</dimen>

    <dimen name="action_bar_size">48dp</dimen>

    <!--This value should equal actionBarSize + (2 x search_bar_margin)-->

    <dimen name="action_bar_space_height">64dp</dimen>

    <dimen name="action_bar_space_margin">@dimen/action_bar_space_height</dimen>

    <dimen name="action_mode_text_size">18sp</dimen>



    <dimen name="refresh_icon_range">64dp</dimen>