From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 22 Jul 2015 18:15:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8c92889fa18178521c8b140ba3ba43df186e54e5?hp=--cc

Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
---

8c92889fa18178521c8b140ba3ba43df186e54e5
diff --cc res/xml/preferences.xml
index b922764b,4823a83f..9c08f26d
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -22,28 -22,17 +22,20 @@@
      </PreferenceCategory>
      
  	<PreferenceCategory android:title="@string/prefs_category_security">
- 	    <!-- ListPreference
- 	        android:key="select_oc_account"
- 	        android:title="@string/prefs_select_oc_account"
- 	        android:summary="@string/prefs_summary_select_oc_account"
- 	        / -->
- 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
-                         android:summary="@string/prefs_pincode_summary"/>
+ 	    <android.preference.CheckBoxPreference android:title="@string/prefs_passcode" android:key="set_pincode" />
  	</PreferenceCategory>
  
 -    <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
 -         <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
 +    <PreferenceCategory android:title="@string/prefs_category_instant_uploading">
 +	    <EditTextPreference android:title="@string/prefs_instant_upload_path_title"
 +	        				android:defaultValue="@string/instant_upload_path"
 +	        				android:key="instant_upload_path"/>
-    	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
-        				android:disableDependentsState="true"
-        				android:title="@string/instant_upload_on_charging"
-        				android:key="instant_upload_on_charging"/>
 +	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
  	                        android:title="@string/prefs_instant_upload"
  	                        android:summary="@string/prefs_instant_upload_summary"/>
- 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
- 	        				android:disableDependentsState="true"
+          <com.owncloud.android.ui.PreferenceWithLongSummary
+ 							android:title="@string/prefs_instant_upload_path_title"
+ 							android:key="instant_upload_path" />
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
  	        				android:title="@string/instant_upload_on_wifi"
  	        				android:key="instant_upload_on_wifi"/>
  	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading"