diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2015-06-11 20:43:17 +0200 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2015-06-12 11:07:06 +0000 |
| commit | 371cecff13c1ba8d2ace97695c7ede6d90440736 (patch) | |
| tree | f34957c9c240015c8f1dc668098f85a341b3fdbe /android | |
| parent | 543389a813879d16bde12d3edcaa802c994ec1be (diff) | |
Android: do not hide toolbar under the drawer
Change-Id: I329b1e5eb63c023a488c72137d9775f1f19b9e3d
Reviewed-on: https://gerrit.libreoffice.org/16247
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/source/res/layout/activity_document_browser.xml | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index f54591b35ef4..297dba1558e6 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -6,31 +6,38 @@ License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<android.support.v4.widget.DrawerLayout +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical" > - <!-- The content --> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/browser_main_content" + <!-- The toolbar --> + <include layout="@layout/toolbar" /> + + <android.support.v4.widget.DrawerLayout + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="match_parent"> - <include layout="@layout/toolbar"/> + <!-- The content --> - </LinearLayout> + <LinearLayout + android:id="@+id/browser_main_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> - <!-- The navigation drawer --> - <ListView android:id="@+id/left_drawer" - android:layout_width="240dp" - android:layout_height="match_parent" - android:layout_gravity="start" - android:choiceMode="singleChoice" - android:divider="@android:color/transparent" - android:dividerHeight="0dp" - android:background="#111"/> + <!-- The navigation drawer --> + <ListView + android:id="@+id/left_drawer" + android:layout_width="240dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="#111" + android:choiceMode="singleChoice" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> -</android.support.v4.widget.DrawerLayout> + </android.support.v4.widget.DrawerLayout> +</LinearLayout> |