projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed typo in strings.xml
[pub/Android/ownCloud.git]
/
res
/
layout
/
preview_image_fragment.xml
diff --git
a/res/layout/preview_image_fragment.xml
b/res/layout/preview_image_fragment.xml
index
91af0f8
..
eb0ec4d
100644
(file)
--- a/
res/layout/preview_image_fragment.xml
+++ b/
res/layout/preview_image_fragment.xml
@@
-5,9
+5,8
@@
Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify
Copyright (C) 2012-2013 ownCloud Inc.
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
@@
-24,22
+23,30
@@
android:id="@+id/fdScrollView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/fdScrollView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@color/
owncloud_white
"
+ android:background="@color/
background_color
"
android:gravity="center_horizontal"
-->
android:gravity="center_horizontal"
-->
-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/top"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/top"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="
@color/owncloud_white
"
+ android:background="
#000000
"
tools:context=".ui.fragment.PreviewImageFragment" >
tools:context=".ui.fragment.PreviewImageFragment" >
- <
ImageView
- android:id="@+id/
image
"
+ <
ProgressBar
+ android:id="@+id/
progressWheel
"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:indeterminate="true"
+ android:indeterminateOnly="true"
+ android:layout_centerInParent="true"
+ />
+
+ <com.ortiz.touch.TouchImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_margin="0dp"
android:layout_centerInParent="true"
android:contentDescription="@string/preview_image_description"
android:layout_margin="0dp"
android:layout_centerInParent="true"
android:contentDescription="@string/preview_image_description"