instant uploading, first attempt

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / Preferences.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/Preferences.java b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
index 0c17d7c..01a21ec 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -78,21 +78,6 @@ public class Preferences extends SherlockPreferenceActivity implements
         populateAccountList();\r
         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r
         populateAccountList();\r
         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r

-\r
-        // Update summary for device tracking preference\r
-        mTrackingUpdateInterval = (ListPreference) findPreference("devicetracking_update_intervall");\r
-        String trackingSummary = getResources().getString(\r
-                R.string.prefs_trackmydevice_interval_summary);\r
-        trackingSummary = String.format(trackingSummary,\r
-                mTrackingUpdateInterval.getValue());\r
-        mTrackingUpdateInterval.setSummary(trackingSummary);\r
-        mTrackingUpdateInterval.setOnPreferenceChangeListener(this);\r
-\r
-        // Enable or disable device tracking service. Listen on events\r
-        mDeviceTracking = (CheckBoxPreference) findPreference("enable_devicetracking");\r
-        mDeviceTracking.setOnPreferenceChangeListener(this);\r
-\r
-        // populateSessionList();\r

     }\r
 \r
     private void populateSessionList() {\r
     }\r
 \r
     private void populateSessionList() {\r


@@ -131,7 +116,7 @@ public class Preferences extends SherlockPreferenceActivity implements
         if (defaultAccount != null) {\r
             mAccountList.setSummary(defaultAccount.name);\r
         }\r
         if (defaultAccount != null) {\r
             mAccountList.setSummary(defaultAccount.name);\r
         }\r

-\r
+        \r

         // Transform accounts into array of string for preferences to use\r
         String[] accNames = new String[mAccounts.length];\r
         for (int i = 0; i < mAccounts.length; i++) {\r
         // Transform accounts into array of string for preferences to use\r
         String[] accNames = new String[mAccounts.length];\r
         for (int i = 0; i < mAccounts.length; i++) {\r


@@ -180,7 +165,7 @@ public class Preferences extends SherlockPreferenceActivity implements
                     getPreferenceScreen().getPreference(mSelectedMenuItem + 1));\r
             break;\r
         case android.R.id.home:\r
                     getPreferenceScreen().getPreference(mSelectedMenuItem + 1));\r
             break;\r
         case android.R.id.home:\r

-            intent = new Intent(getBaseContext(), LandingActivity.class);\r
+            intent = new Intent(getBaseContext(), FileDisplayActivity.class);\r

             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
             startActivity(intent);\r
             break;\r
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
             startActivity(intent);\r
             break;\r