From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 21 May 2012 20:57:17 +0000 (+0200)
Subject: remove preferences its not needed for now
X-Git-Tag: oc-android-1.4.3~402
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4ee419da912da08b241551ae54f64bb8d8986623?ds=inline;hp=--cc

remove preferences its not needed for now
---

4ee419da912da08b241551ae54f64bb8d8986623
diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index b630c7c9..c148bd36 100644
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/startSync" android:title="Sync account" android:showAsAction="ifRoom" android:icon="@drawable/ic_action_refresh"></item><item android:title="Settings" android:icon="@android:drawable/ic_menu_preferences" android:id="@+id/settingsItem" android:showAsAction="never"></item>
+    <item android:id="@+id/startSync" android:title="Sync account" android:showAsAction="ifRoom" android:icon="@drawable/ic_action_refresh"></item>
     <item android:id="@+id/createDirectoryItem" android:title="Create Directory" android:icon="@drawable/ic_action_create_dir" android:showAsAction="ifRoom"></item>
     
     <item android:id="@+id/search" android:icon="@drawable/ic_action_search" android:showAsAction="ifRoom"></item>
diff --git a/res/menu/prefs_menu.xml b/res/menu/prefs_menu.xml
deleted file mode 100644
index c3f64652..00000000
--- a/res/menu/prefs_menu.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/addSessionItem" android:icon="@+android:drawable/ic_menu_add" android:title="@string/prefs_add_session"></item>
-</menu>
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index ef31ce8b..126e3387 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -177,6 +177,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         setProgressBarIndeterminateVisibility(false);
         // if (getSupportFragmentManager().findFragmentById(R.id.fileList) ==
         // null)
+        Log.e("ASDaaa", "ASDaaa");
         setContentView(R.layout.files);
 
     }
@@ -185,41 +186,36 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
         switch (item.getItemId()) {
-        case R.id.settingsItem: {
-            Intent i = new Intent(this, Preferences.class);
-            startActivity(i);
-            break;
-        }
-        case R.id.createDirectoryItem: {
-            showDialog(DIALOG_CREATE_DIR);
-            break;
-        }
-        case R.id.startSync: {
-            Bundle bundle = new Bundle();
-            bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-            ContentResolver.requestSync(
-                    AccountUtils.getCurrentOwnCloudAccount(this),
-                    "org.owncloud", bundle);
-            break;
-        }
-        case R.id.action_upload: {
-            Intent action = new Intent(Intent.ACTION_GET_CONTENT);
-            action = action.setType("*/*")
-                    .addCategory(Intent.CATEGORY_OPENABLE);
-            startActivityForResult(
-                    Intent.createChooser(action, "Upload file from..."),
-                    ACTION_SELECT_FILE);
-            break;
-        }
-
-        case android.R.id.home: {
-            Intent i = new Intent(this, AccountSelectActivity.class);
-            startActivity(i);
-            finish();
-            break;
-        }
-        default:
-            retval = false;
+            case R.id.createDirectoryItem: {
+                showDialog(DIALOG_CREATE_DIR);
+                break;
+            }
+            case R.id.startSync: {
+                Bundle bundle = new Bundle();
+                bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+                ContentResolver.requestSync(
+                        AccountUtils.getCurrentOwnCloudAccount(this),
+                        "org.owncloud", bundle);
+                break;
+            }
+            case R.id.action_upload: {
+                Intent action = new Intent(Intent.ACTION_GET_CONTENT);
+                action = action.setType("*/*")
+                        .addCategory(Intent.CATEGORY_OPENABLE);
+                startActivityForResult(
+                        Intent.createChooser(action, "Upload file from..."),
+                        ACTION_SELECT_FILE);
+                break;
+            }
+    
+            case android.R.id.home: {
+                Intent i = new Intent(this, AccountSelectActivity.class);
+                startActivity(i);
+                finish();
+                break;
+            }
+            default:
+                retval = false;
         }
         return retval;
     }