projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
[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
611351b
..
11f88ba
100644
(file)
--- a/
res/layout/preview_image_fragment.xml
+++ b/
res/layout/preview_image_fragment.xml
@@
-29,8
+29,8
@@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/top"
<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:layout_width="
match
_parent"
+ android:layout_height="
match
_parent"
android:background="#000000"
tools:context=".ui.fragment.PreviewImageFragment" >
android:background="#000000"
tools:context=".ui.fragment.PreviewImageFragment" >
@@
-42,7
+42,7
@@
android:indeterminateOnly="true"
android:layout_centerInParent="true"
/>
android:indeterminateOnly="true"
android:layout_centerInParent="true"
/>
-
+
<third_parties.michaelOrtiz.TouchImageViewCustom
android:id="@+id/image"
android:layout_width="match_parent"
<third_parties.michaelOrtiz.TouchImageViewCustom
android:id="@+id/image"
android:layout_width="match_parent"
@@
-57,9
+57,10
@@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_
below="@id/imag
e"
+ android:layout_
alignParentBottom="tru
e"
android:layout_margin="40dp"
android:text="@string/placeholder_sentence"
android:layout_margin="40dp"
android:text="@string/placeholder_sentence"
+ android:textColor="@color/owncloud_blue_bright"
/>
/>
-
+
</RelativeLayout>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file