From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 18 Oct 2015 08:08:46 +0000 (+0200)
Subject: Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7fe9c02bffe53c3a8a40ee68e1a5c4c713c9d899?ds=inline

Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
---

7fe9c02bffe53c3a8a40ee68e1a5c4c713c9d899
diff --cc res/xml/preferences.xml
index d38adabb,9b4b9b7b..ff711ea0
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@@ -18,64 -18,67 +18,75 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
- 	<PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
- 	</PreferenceCategory>
- 
+     <PreferenceCategory
+ 		android:title="@string/prefs_category_accounts"
+ 		android:key="accounts_category">
+     </PreferenceCategory>
+     
  	<PreferenceCategory android:title="@string/prefs_category_security">
 -	    <android.preference.CheckBoxPreference
 -			android:title="@string/prefs_passcode"
 -			android:key="set_pincode" />
 +		<!-- 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"/>
  	</PreferenceCategory>
  
- 	<PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
- 		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
- 			android:title="@string/prefs_instant_upload"
- 			android:summary="@string/prefs_instant_upload_summary"/>
- 		<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_wifi"
- 			android:key="instant_upload_on_wifi"/>
- 		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading"
- 			android:title="@string/prefs_instant_video_upload"
- 			android:summary="@string/prefs_instant_video_upload_summary"/>
- 		<EditTextPreference android:title="@string/prefs_instant_video_upload_path_title"
- 			android:defaultValue="@string/instant_upload_path"
- 			android:key="instant_video_upload_path"/>
- 		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading"
- 			android:disableDependentsState="true"
- 			android:title="@string/instant_video_upload_on_wifi"
- 			android:key="instant_video_upload_on_wifi"/>
+     <PreferenceCategory android:title="@string/prefs_category_instant_uploading"
+ 		android:key="instant_uploading_category">
+ 	    <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.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"
+ 	                        android:title="@string/prefs_instant_video_upload"
+ 	                        android:summary="@string/prefs_instant_video_upload_summary" />
+ 	    <com.owncloud.android.ui.PreferenceWithLongSummary
+ 							android:title="@string/prefs_instant_video_upload_path_title"
+ 							android:key="instant_video_upload_path" />
+ 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+ 	        				android:title="@string/instant_video_upload_on_wifi"
+ 	        				android:key="instant_video_upload_on_wifi"/>
 +		<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"/>
- 		<!-- DISABLED FOR RELEASE UNTIL FIXED
-         CheckBoxPreference android:key="log_to_file"
-                             android:title="@string/prefs_log_title"
-                             android:summary="@string/prefs_log_summary"/>
-         <Preference 		android:key="log_history"
-                             android:title="@string/prefs_log_title_history"
-                             android:summary="@string/prefs_log_summary_history"/ -->
- 
- 	</PreferenceCategory>
- 
+ 	    <!-- DISABLED FOR RELEASE UNTIL FIXED
+ 	    CheckBoxPreference android:key="log_to_file"
+ 	                        android:title="@string/prefs_log_title"
+ 	                        android:summary="@string/prefs_log_summary"/>
+ 		<Preference 		android:key="log_history"
+ 	                        android:title="@string/prefs_log_title_history"
+ 	                        android:summary="@string/prefs_log_summary_history"/ -->
+                         
+     </PreferenceCategory>
+ 	
  	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
 -    <Preference android:title="@string/prefs_help" android:key="help" />
 -    <Preference android:title="@string/prefs_recommend" android:key="recommend" />
 -    <Preference android:title="@string/prefs_feedback" android:key="feedback" />
 -    <Preference android:title="@string/prefs_imprint" android:key="imprint" />
 -                        
 -	<Preference 		android:id="@+id/about_app" 
 -        				android:title="@string/about_title" 
 -        				android:key="about_app" />
 +		<Preference android:title="@string/prefs_help" android:key="help" />
 +		<Preference android:title="@string/prefs_recommend" android:key="recommend" />
 +		<Preference android:title="@string/prefs_feedback" android:key="feedback" />
 +		<Preference android:title="@string/prefs_imprint" android:key="imprint" />
 +
 +		<Preference 		android:id="@+id/about_app"
 +			android:title="@string/about_title"
 +			android:key="about_app" />
  	</PreferenceCategory>
 -    
 +
  
  </PreferenceScreen>