Changed navigation behavior again after some feedback ;-)

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

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index f0bc4f2..10a8671 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -46,7 +46,7 @@ import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.authenticator.AuthUtils;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.authenticator.AuthUtils;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r

-import eu.alefzero.owncloud.ui.fragment.FileList;\r
+import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r

 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r


@@ -137,9 +137,26 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                        showDialog(0);\r
                        break;\r
                }\r
                        showDialog(0);\r
                        break;\r
                }\r

+               case android.R.id.home: {\r
+                       onBackPressed();\r
+                       break;\r
+               }\r
+                       \r

                }\r
                return true;\r
        }\r
                }\r
                return true;\r
        }\r

+       \r
+       @Override\r
+       public void onBackPressed(){\r
+               popPath();\r
+               if(mDirectories.getCount() == 0) {\r
+                       Intent intent = new Intent(this, LandingActivity.class);\r
+                       startActivity(intent);\r
+                       return;\r
+               }\r
+               ((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))\r
+                               .onNavigateUp();\r
+       }\r

 \r
        @Override\r
        protected Dialog onCreateDialog(int id) {\r
 \r
        @Override\r
        protected Dialog onCreateDialog(int id) {\r


@@ -196,17 +213,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                return true;\r
        }\r
 \r
                return true;\r
        }\r
 \r

-       @Override\r
-       public void onBackPressed() {\r
-               popPath();\r
-               if (mDirectories.getCount() == 0) {\r
-                       super.onBackPressed();\r
-                       return;\r
-               }\r
-               ((FileList) getSupportFragmentManager().findFragmentById(R.id.fileList))\r
-                               .onBackPressed();\r
-       }\r
-\r

        private class DirectoryCreator implements Runnable {\r
                private String mTargetPath;\r
                private Account mAccount;\r
        private class DirectoryCreator implements Runnable {\r
                private String mTargetPath;\r
                private Account mAccount;\r