Merge branch 'fragments-ui' of

ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
	src/eu/alefzero/owncloud/datamodel/OCFile.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 5bf7146..5ae763c 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -145,7 +145,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                        break;\r
                }\r
                case android.R.id.home: {\r
-                       navigateUp();\r
+                       onBackPressed();\r
                        break;\r
                }\r
                        \r
@@ -153,11 +153,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                return true;\r
        }\r
        \r
-       public void navigateUp(){\r
+       @Override\r
+       public void onBackPressed(){\r
                popPath();\r
                if(mDirectories.getCount() == 0) {\r
                        Intent intent = new Intent(this, LandingActivity.class);\r
-                       intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
                        startActivity(intent);\r
                        return;\r
                }\r
@@ -215,7 +215,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
        public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
                int i = itemPosition;\r
                while (i-- != 0) {\r
-                       navigateUp();\r
+                       onBackPressed();\r
                }\r
                return true;\r
        }\r
@@ -279,4 +279,4 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
                \r
        }\r
-}
\ No newline at end of file
+}