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

Commit e5a3bb76 authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Made breadcrumb drop down match mocks" into nyc-dev

parents e27a4376 b6db0223

packages/DocumentsUI/res/layout/drawer_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="4dp"

                    android:popupTheme="?actionBarPopupTheme"

                    android:overlapAnchor="true" />



            </com.android.documentsui.DocumentsToolbar>

packages/DocumentsUI/res/layout/fixed_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="4dp"

                android:popupTheme="?actionBarPopupTheme"

                android:overlapAnchor="true" />



        </com.android.documentsui.DocumentsToolbar>

packages/DocumentsUI/res/layout/item_subdir.xml

+0 −10
Original line number Diff line number Diff line
@@ -24,16 +24,6 @@ 
    android:orientation="horizontal"

    android:baselineAligned="false">



    <ImageView

        android:id="@+id/subdir"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:paddingEnd="8dp"

        android:scaleType="centerInside"

        android:visibility="gone"

        android:src="@drawable/ic_subdirectory_arrow"

        android:contentDescription="@null" />



    <TextView

        android:id="@android:id/title"

        android:layout_width="0dp"

packages/DocumentsUI/res/layout/single_pane_layout.xml

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:popupTheme="?actionBarPopupTheme"

                android:layout_marginStart="4dp"

                android:overlapAnchor="true" />

packages/DocumentsUI/src/com/android/documentsui/NavigationView.java

+0 −3
Original line number Diff line number Diff line
@@ -220,17 +220,14 @@ class NavigationView { 
                        .inflate(R.layout.item_subdir, parent, false);

            }



            final ImageView subdir = (ImageView) convertView.findViewById(R.id.subdir);

            final TextView title = (TextView) convertView.findViewById(android.R.id.title);

            final DocumentInfo doc = getItem(position);



            if (position == 0) {

                final RootInfo root = mEnv.getCurrentRoot();

                title.setText(root.title);

                subdir.setVisibility(View.GONE);

            } else {

                title.setText(doc.displayName);

                subdir.setVisibility(View.VISIBLE);

            }



            return convertView;