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?hp=9364edbb117eec6cd4de90266ffff3101aceef8d

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

diff --git a/res/values-tzl/strings.xml b/res/values-tzl/strings.xml
deleted file mode 100644
index 37e61524..00000000
--- a/res/values-tzl/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--TODO re-enable when server-side folder size calculation is available   
-    	<item>Biggest - Smallest</item>-->
-  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
-  <!--<string name="drawer_item_accounts">Accounts</string>-->
-  <!--TODO re-enable when "On Device" is available
-    <string name="drawer_item_on_device">On device</string>-->
-  <string name="empty"></string>
-</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 9b4b9b7b..ff711ea0 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2012-2013 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -24,9 +24,13 @@
     </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"
@@ -59,6 +63,10 @@
 	    <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"
@@ -70,15 +78,15 @@
     </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>
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index e1c5c10d..d980b977 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -457,8 +457,8 @@ public class Preferences extends PreferenceActivity
             mPrefInstantUploadCategory.addPreference(mPrefInstantUploadPathWiFi);
             mPrefInstantUploadCategory.addPreference(mPrefInstantUploadPath);
         } else {
-            mPrefInstantUploadCategory.removePreference(mPrefInstantUploadPathWiFi);
-            mPrefInstantUploadCategory.removePreference(mPrefInstantUploadPath);
+//            mPrefInstantUploadCategory.removePreference(mPrefInstantUploadPathWiFi);
+//            mPrefInstantUploadCategory.removePreference(mPrefInstantUploadPath);
         }
     }
     
@@ -467,8 +467,8 @@ public class Preferences extends PreferenceActivity
             mPrefInstantUploadCategory.addPreference(mPrefInstantVideoUploadPathWiFi);
             mPrefInstantUploadCategory.addPreference(mPrefInstantVideoUploadPath);
         } else {
-            mPrefInstantUploadCategory.removePreference(mPrefInstantVideoUploadPathWiFi);
-            mPrefInstantUploadCategory.removePreference(mPrefInstantVideoUploadPath);
+//            mPrefInstantUploadCategory.removePreference(mPrefInstantVideoUploadPathWiFi);
+//            mPrefInstantUploadCategory.removePreference(mPrefInstantVideoUploadPath);
         }
     }
 
@@ -805,7 +805,7 @@ public class Preferences extends PreferenceActivity
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
-        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
+//        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
     }
 
     /**