projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delete values-tzl
[pub/Android/ownCloud.git]
/
res
/
layout
/
preview_image_activity.xml
diff --git
a/res/layout/preview_image_activity.xml
b/res/layout/preview_image_activity.xml
index
7884f02
..
13aff8a
100644
(file)
--- a/
res/layout/preview_image_activity.xml
+++ b/
res/layout/preview_image_activity.xml
@@
-2,12
+2,11
@@
<!--
ownCloud Android client application
<!--
ownCloud Android client application
- Copyright (C) 201
2-2013
ownCloud Inc.
+ Copyright (C) 201
5
ownCloud Inc.
This program is free software: you can redistribute it and/or modify
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ it under the terms of the GNU General Public License version 2,
+ as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-17,16
+16,30
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<android.support.v4.widget.DrawerLayout 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_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical" >
+ android:clickable="true" >
+
+ <com.ortiz.touch.ExtendedViewPager
+ android:id="@+id/fragmentPager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ />
- <LinearLayout
+ <include
+ layout="@layout/drawer"
+ android:layout_width="240dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"/>
+
+ <!-- LinearLayout
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <!-
- Preview: layout=@layout/preview_image_fragment -
->
- </LinearLayout>
+ <!-
- Preview: layout=@layout/preview_image_fragment -
->
+ </LinearLayout
--
>
-</
Linea
rLayout>
\ No newline at end of file
+</
android.support.v4.widget.Drawe
rLayout>
\ No newline at end of file