Fixed typo in strings.xml

[pub/Android/ownCloud.git] / res / layout / file_preview.xml

diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index 3b2a392..483a369 100644 (file)
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.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


@@ -19,36 +18,47 @@
   
 -->
 
   
 -->
 

-<!--
-     ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fdScrollView"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/owncloud_white" 
-    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"
 <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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color"

     android:gravity="center"
     tools:context=".ui.fragment.FilePreviewFragment" >
 
     android:gravity="center"
     tools:context=".ui.fragment.FilePreviewFragment" >
 

-    <ImageView
-        android:id="@+id/image_preview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/image_preview"
-        android:src="@drawable/owncloud_logo" />
+    <FrameLayout 
+        android:id="@+id/visual_area"
+           android:layout_width="match_parent"
+           android:layout_height="0dp"
+           android:layout_alignParentTop="true"
+           android:layout_above="@+id/media_controller"
+        >

     
     

-       <VideoView  
-           android:id="@+id/video_preview"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"  
-               android:layout_gravity="center" />
+           <ImageView
+               android:id="@+id/image_preview"
+               android:layout_width="match_parent"
+               android:layout_height="match_parent"
+               android:layout_margin="16dp"
+               android:layout_gravity="center"
+               android:contentDescription="@string/preview_image_description"
+               android:src="@drawable/logo" />
+           
+               <VideoView  
+                   android:id="@+id/video_preview"
+                       android:layout_width="match_parent"
+                       android:layout_height="match_parent"  
+                       android:layout_gravity="center" 
+                       android:visibility="gone"
+                       />
+               
+       </FrameLayout>
+       
+       <com.owncloud.android.media.MediaControlView 
+           android:id="@id/media_controller"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:layout_alignParentBottom="true"
+           />

 
 </RelativeLayout>
\ No newline at end of file
 
 </RelativeLayout>
\ No newline at end of file