Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...

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

diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
index 93983c2..0ad98e3 100644 (file)
--- a/res/layout/file_details_fragment.xml
+++ b/res/layout/file_details_fragment.xml
@@ -21,6 +21,7 @@
        android:id="@+id/fdScrollView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:id="@+id/fdScrollView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"

+       android:fillViewport="true"

        >
 
        <RelativeLayout
        >
 
        <RelativeLayout


@@ -32,6 +33,7 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginLeft="16dp"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginLeft="16dp"

+                       android:layout_marginRight="16dp"

                        android:layout_marginTop="4dp" >
        
                        <ImageView
                        android:layout_marginTop="4dp" >
        
                        <ImageView


@@ -55,6 +57,8 @@
                        android:id="@+id/fdDetailsContainer"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:id="@+id/fdDetailsContainer"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"

+                       android:layout_marginLeft="16dp"
+                       android:layout_marginRight="16dp"

                        android:layout_below="@id/fdFileHeaderContainer" >
                
                        <RelativeLayout
                        android:layout_below="@id/fdFileHeaderContainer" >
                
                        <RelativeLayout


@@ -62,8 +66,7 @@
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_alignParentLeft="true"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_alignParentLeft="true"

-                               android:layout_alignParentTop="true"
-                               android:layout_marginLeft="16dp" >
+                               android:layout_alignParentTop="true" >

                                
                                <TextView
                                        android:id="@+id/fdTypeLabel"
                                
                                <TextView
                                        android:id="@+id/fdTypeLabel"


@@ -160,16 +163,16 @@
                        >
                        
                        <CheckBox
                        >
                        
                        <CheckBox

-                               android:id="@+id/fdKeepInSync"
+                               android:id="@+id/fdFavorite"

                                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:text="@string/fd_keep_in_sync" />
+                               android:text="@string/favorite" />

 
                        <LinearLayout
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
 
                        <LinearLayout
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"

-                               android:layout_below="@id/fdKeepInSync"
+                               android:layout_below="@id/fdFavorite"

                                android:orientation="vertical" >
                                
                        <TextView 
                                android:orientation="vertical" >
                                
                        <TextView 


@@ -194,8 +197,8 @@
                                                android:layout_width="0dp"
                                                android:layout_height="wrap_content"
                                                android:layout_weight="1"
                                                android:layout_width="0dp"
                                                android:layout_height="wrap_content"
                                                android:layout_weight="1"

-                                               android:progressDrawable="@android:drawable/progress_horizontal"
-                                               android:indeterminate="false" 
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:indeterminate="false"

                                                android:indeterminateOnly="false" 
                                        />
                                                                                                
                                                android:indeterminateOnly="false" 
                                        />
                                                                                                


@@ -204,7 +207,7 @@
                                                android:layout_width="wrap_content"
                                                android:layout_height="wrap_content"
                                                android:layout_marginLeft="12dp"
                                                android:layout_width="wrap_content"
                                                android:layout_height="wrap_content"
                                                android:layout_marginLeft="12dp"

-                                               android:src="@drawable/btn_cancel"
+                                               android:src="@drawable/ic_cancel"

                                                android:background="@android:color/transparent"
                                                />
                                                
                                                android:background="@android:color/transparent"
                                                />