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

Commit 546d937e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Load layout specific breadcrumb view."

parents 6e150baa 63e37fb5

packages/DocumentsUI/res/layout/drawer_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
                android:popupTheme="?actionBarPopupTheme">



                <com.android.documentsui.DropdownBreadcrumb

                    android:id="@+id/breadcrumb"

                    android:id="@+id/dropdown_breadcrumb"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="4dp"

packages/DocumentsUI/res/layout/fixed_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:popupTheme="?actionBarPopupTheme">



            <com.android.documentsui.HorizontalBreadcrumb

                android:id="@+id/breadcrumb"

                android:id="@+id/horizontal_breadcrumb"

                android:layout_marginRight="20dp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

packages/DocumentsUI/res/values-sw720dp-land/config.xml

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

</resources>

packages/DocumentsUI/res/values/layouts.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,5 +17,4 @@ 
<resources>

    <item name="documents_activity" type="layout">@layout/drawer_layout</item>

    <item name="files_activity" type="layout">@layout/drawer_layout</item>

    <item name="downloads_activity" type="layout">@layout/single_pane_layout</item>

</resources>

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

+5 −1
Original line number Diff line number Diff line
@@ -141,8 +141,12 @@ public abstract class BaseActivity extends Activity 
        mSearchManager = new SearchViewManager(this, icicle);



        DocumentsToolbar toolbar = (DocumentsToolbar) findViewById(R.id.toolbar);

        Breadcrumb breadcrumb = (Breadcrumb) findViewById(R.id.breadcrumb);

        setActionBar(toolbar);



        Breadcrumb breadcrumb =

                Shared.findView(this, R.id.dropdown_breadcrumb, R.id.horizontal_breadcrumb);

        assert(breadcrumb != null);



        mNavigator = new NavigationViewManager(mDrawer, toolbar, mState, this, breadcrumb);



        // Base classes must update result in their onCreate.