Cancel button for downloads in progress replaceed with 'x' icon

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

diff --git a/res/layout/file_download_fragment.xml b/res/layout/file_download_fragment.xml
index 9c91c37..f881847 100644 (file)
--- a/res/layout/file_download_fragment.xml
+++ b/res/layout/file_download_fragment.xml
@@ -32,23 +32,37 @@
                android:layout_marginBottom="15dp"
        />
        
-       <ProgressBar android:id="@+id/progressBar"
-               android:layout_width="match_parent" 
+    <LinearLayout
+        android:id="@+id/fdProgressBlock"
+               android:layout_width="match_parent"
                android:layout_height="wrap_content"
-               android:progressDrawable="@android:drawable/progress_horizontal"
-               android:indeterminate="false" 
-               android:indeterminateOnly="false" 
+               android:gravity="center"
+               android:layout_marginTop="12dp"
                android:layout_marginBottom="15dp"
-       />
-       
-       <Button
-               android:id="@+id/cancelBtn"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:text="@string/common_cancel" 
-               android:layout_marginBottom="15dp"
-       />
-       
+               android:orientation="horizontal"
+               >
+                                       
+               <ProgressBar android:id="@+id/progressBar"
+                       android:layout_width="0dp" 
+                       android:layout_height="wrap_content"
+                       android:layout_weight="1"
+                       android:progressDrawable="@android:drawable/progress_horizontal"
+                       android:indeterminate="false" 
+                       android:indeterminateOnly="false" 
+                       
+               />
+
+               <ImageButton
+                       android:id="@+id/cancelBtn"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_marginLeft="12dp"
+                       android:src="@drawable/btn_cancel"
+                       android:background="@android:color/transparent"
+               />
+
+       </LinearLayout>
+                       
        <ImageView
                android:id="@+id/error_image"
                android:layout_width="wrap_content"