Merge branch 'develop' into regular_authentication_in_saml_server

[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..253c829 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,7 +23,7 @@
     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"
 -->
 


@@ -33,9 +32,18 @@
     android:id="@+id/top"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:id="@+id/top"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"

-    android:background="@color/owncloud_white"
+    android:background="@color/background_color"

     tools:context=".ui.fragment.PreviewImageFragment" >
 
     tools:context=".ui.fragment.PreviewImageFragment" >
 

+    <ProgressBar 
+        android:id="@+id/progressWheel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:indeterminateOnly="true"
+        android:layout_centerInParent="true"
+        />
+    

     <ImageView
         android:id="@+id/image"
         android:layout_width="wrap_content"
     <ImageView
         android:id="@+id/image"
         android:layout_width="wrap_content"