Change the title of preference for adding new accounts and remove unused commented...

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85a35c4..c9927ec 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -280,5 +280,6 @@
        <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
 
        <string name="prefs_category_accounts">Accounts</string>
        <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
 
        <string name="prefs_category_accounts">Accounts</string>

+       <string name="prefs_add_account">Add account</string>

 
 </resources>
 
 </resources>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d502e88..4ce05db 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,7 +19,7 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">

-        <com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_manage_accounts" android:key="add_account" />
+        <com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_add_account" android:key="add_account" />

     </PreferenceCategory>
     
        <PreferenceCategory android:title="@string/prefs_category_general">
     </PreferenceCategory>
     
        <PreferenceCategory android:title="@string/prefs_category_general">


@@ -28,7 +28,6 @@
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->

-    <com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_manage_accounts" android:key="manage_account" />

     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
                         android:summary="@string/prefs_pincode_summary"/>
     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 
     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
                         android:summary="@string/prefs_pincode_summary"/>
     <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 2d3e9ea..e549ec2 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -100,29 +100,12 @@ public class Preferences extends SherlockPreferenceActivity {
             pAddAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
             pAddAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {

-
-                    /*
-                     * Intent intent = new Intent(
-                     * android.provider.Settings.ACTION_ADD_ACCOUNT);
-                     * intent.putExtra("authorities", new String[] {
-                     * MainApp.getAuthTokenType() }); startActivity(intent);
-                     */

                     AccountManager am = AccountManager.get(getApplicationContext());
                     am.addAccount(MainApp.getAccountType(), null, null, null, Preferences.this, null, null);
                     return true;
             }
         });
 
                     AccountManager am = AccountManager.get(getApplicationContext());
                     am.addAccount(MainApp.getAccountType(), null, null, null, Preferences.this, null, null);
                     return true;
             }
         });
 

-        Preference pManageAccount = findPreference("manage_account");
-        if (pManageAccount != null)
-            pManageAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    Intent i = new Intent(getApplicationContext(), AccountSelectActivity.class);
-                    startActivity(i);
-                    return true;
-                }
-            });

         
         pCode = (CheckBoxPreference) findPreference("set_pincode");
         if (pCode != null){
         
         pCode = (CheckBoxPreference) findPreference("set_pincode");
         if (pCode != null){


@@ -139,8 +122,6 @@ public class Preferences extends SherlockPreferenceActivity {
             });            
             
         }
             });            
             
         }

-        
-        

 
         PreferenceCategory preferenceCategory = (PreferenceCategory) findPreference("more");
         
 
         PreferenceCategory preferenceCategory = (PreferenceCategory) findPreference("more");