aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout/navigation.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout/navigation.xml')
-rw-r--r--res/layout/navigation.xml68
1 files changed, 39 insertions, 29 deletions
diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml
index 68df9c4f..051f35d6 100644
--- a/res/layout/navigation.xml
+++ b/res/layout/navigation.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The CyanogenMod Project
+<!--
+ Copyright (C) 2012 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,33 +13,42 @@
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.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
- android:id="@+id/navigation_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <!-- Navigation View -->
- <com.cyanogenmod.filemanager.ui.widgets.NavigationView
- android:id="@+id/navigation_view"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- filemanager:navigation="browsable" />
+-->
- <!-- SelectionBar -->
- <com.cyanogenmod.filemanager.ui.widgets.SelectionView
- android:id="@+id/navigation_selectionbar"
+<com.cyanogenmod.filemanager.ui.widgets.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager"
+ android:id="@+id/drawer_layout"
android:layout_width="match_parent"
- android:layout_height="@dimen/small_row_height"
- android:background="@drawable/bg_holo_selectionbar"
- android:visibility="invisible" />
-
- <!-- StatusBar -->
- <include layout="@layout/navigation_view_statusbar" />
-
-</LinearLayout>
+ android:layout_height="match_parent" >
+
+ <!-- The main content view -->
+ <LinearLayout
+ android:id="@+id/navigation_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <!-- Navigation View -->
+ <com.cyanogenmod.filemanager.ui.widgets.NavigationView
+ android:id="@+id/navigation_view"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ filemanager:navigation="browsable" />
+
+ <!-- SelectionBar -->
+ <com.cyanogenmod.filemanager.ui.widgets.SelectionView
+ android:id="@+id/navigation_selectionbar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/small_row_height"
+ android:background="@drawable/bg_holo_selectionbar"
+ android:visibility="invisible" />
+
+ <!-- StatusBar -->
+ <include layout="@layout/navigation_view_statusbar" />
+ </LinearLayout>
+
+ <!-- The navigation drawer -->
+ <include layout="@layout/navigation_drawer" />
+
+</com.cyanogenmod.filemanager.ui.widgets.DrawerLayout> \ No newline at end of file