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

Commit 3e9dd257 authored by Tony Huang's avatar Tony Huang
Browse files

Update to new style breadcrumb 

By requirement, only keep horizontal breadcrumb design on both
phone and tablet platform.

Change in breadcrumb will cause testKeyboard_arrowsRootsList failed
and I found this test is wired. User should only click on tab then
focus on root item. Fix this behavior and also fix test case.

Bug: 143729978
Test: manual
Test: atest DocumentsUIGoogleTests
Change-Id: Ia77589766ac7acc313ca3d177cb6a16dc1432668
parent 90e57791

res/layout-sw720dp/directory_app_bar.xml

+0 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ 
            android:drawableStart="@drawable/ic_menu_search"

            android:drawablePadding="@dimen/search_bar_icon_padding"/>



        <com.android.documentsui.DropdownBreadcrumb

            android:id="@+id/dropdown_breadcrumb"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginStart="4dp"

            android:popupTheme="?actionBarPopupTheme"

            android:background="@android:color/transparent"

            android:overlapAnchor="true"/>



    </androidx.appcompat.widget.Toolbar>



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

res/layout/directory_app_bar.xml

+0 −9
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ 
                android:text="@string/search_bar_hint"

                android:textAppearance="@style/SearchBarTitle"/>



            <com.android.documentsui.DropdownBreadcrumb

                android:id="@+id/dropdown_breadcrumb"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginStart="4dp"

                android:popupTheme="?actionBarPopupTheme"

                android:background="@android:color/transparent"

                android:overlapAnchor="true"/>



        </androidx.appcompat.widget.Toolbar>



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

res/layout/directory_header.xml

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
    android:layout_marginTop="@dimen/action_bar_space_margin"

    android:orientation="vertical">



    <com.android.documentsui.HorizontalBreadcrumb

        android:id="@+id/horizontal_breadcrumb"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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



    <!-- used for search chip. -->

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

res/layout/fixed_layout.xml

+0 −6
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ 
                android:drawableStart="@drawable/ic_menu_search"

                android:drawablePadding="@dimen/search_bar_icon_padding"/>



            <com.android.documentsui.HorizontalBreadcrumb

                android:id="@+id/horizontal_breadcrumb"

                android:layout_marginRight="20dp"

                android:layout_width="match_parent"

                android:layout_height="match_parent" />



        </androidx.appcompat.widget.Toolbar>



        <LinearLayout

res/layout/navigation_breadcrumb_item.xml

+8 −6
Original line number Diff line number Diff line
@@ -28,26 +28,28 @@ 
<LinearLayout

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

  android:layout_width="wrap_content"

  android:layout_height="@dimen/breadcrumb_item_height"

  android:layout_alignParentTop="true"

  android:layout_height="wrap_content"

  android:minHeight="48dp"

  android:focusable="true"

  android:gravity="center_vertical"

  android:orientation="horizontal">



    <com.android.documentsui.DragOverTextView

    <TextView

        android:id="@+id/breadcrumb_text"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:maxWidth="275dp"

        android:gravity="center_vertical"

        android:duplicateParentState="true"

        android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"

        android:maxLines="1"

        android:ellipsize="end"

        android:textAppearance="@style/BreadcrumbText"

        android:background="@drawable/breadcrumb_item_background" />



    <ImageView

        android:id="@+id/breadcrumb_arrow"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_breadcrumb_arrow"

        android:layout_marginTop="2dp" />

        android:src="@drawable/ic_breadcrumb_arrow"/>



</LinearLayout>
 
 No newline at end of file