From: masensio <masensio@solidgear.es>
Date: Tue, 25 Aug 2015 12:53:42 +0000 (+0200)
Subject: Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
X-Git-Tag: oc-android-1.8~27^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b81de1d54710175ce660753e31726fe2174301ff?hp=--cc

Merge branch 'master' into create_folder_button_on_action_bar_for_uploader

Conflicts:
	res/layout/uploader_layout.xml
---

b81de1d54710175ce660753e31726fe2174301ff
diff --cc res/layout/uploader_layout.xml
index 6245c8b8,2ba4a0bf..79b077dc
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@@ -52,16 -52,18 +52,18 @@@
  	    android:layout_alignParentBottom="true"
  	    android:orientation="horizontal" >
  
- 		<Button
+ 		<android.support.v7.widget.AppCompatButton
 -		    android:id="@+id/uploader_new_folder"
 +		    android:id="@+id/uploader_cancel"
+ 			style="@style/ownCloud.Button"
  		    android:layout_width="fill_parent"
  		    android:layout_height="wrap_content"
  		    android:layout_gravity="bottom"
  		    android:layout_weight="1"
 -		    android:text="@string/uploader_btn_new_folder_text" />
 +		    android:text="@string/common_cancel" />
- 		
- 		<Button
+ 
+ 		<android.support.v7.widget.AppCompatButton
  		    android:id="@+id/uploader_choose_folder"
+ 			style="@style/ownCloud.Button"
  		    android:layout_width="fill_parent"
  		    android:layout_height="wrap_content"
  		    android:layout_gravity="bottom"