X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/30c2ede8e5334cb26b7ad0fa69b7a254fab5afc5..df4b83cb75915caaf7ad49848ebb6d340045478b:/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 6c3f2a88..10a8671e 100644
--- 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;
 import eu.alefzero.owncloud.authenticator.AuthUtils;
 import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.ui.fragment.FileList;
+import eu.alefzero.owncloud.ui.fragment.FileListFragment;
 import eu.alefzero.webdav.WebdavClient;
 
 /**
@@ -78,6 +78,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 		final Account a = AuthUtils.getCurrentOwnCloudAccount(this);
 		builder.setView(dirName);
 		builder.setTitle(R.string.uploader_info_dirname);
+		dirName.setTextColor(R.color.setup_text_typed);
 
 		builder.setPositiveButton(R.string.common_ok, new OnClickListener() {
 			public void onClick(DialogInterface dialog, int which) {
@@ -136,9 +137,26 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 			showDialog(0);
 			break;
 		}
+		case android.R.id.home: {
+			onBackPressed();
+			break;
+		}
+			
 		}
 		return true;
 	}
+	
+	@Override
+	public void onBackPressed(){
+		popPath();
+		if(mDirectories.getCount() == 0) {
+			Intent intent = new Intent(this, LandingActivity.class);
+			startActivity(intent);
+			return;
+		}
+		((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList))
+				.onNavigateUp();
+	}
 
 	@Override
 	protected Dialog onCreateDialog(int id) {
@@ -195,17 +213,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 		return true;
 	}
 
-	@Override
-	public void onBackPressed() {
-		popPath();
-		if (mDirectories.getCount() == 0) {
-			super.onBackPressed();
-			return;
-		}
-		((FileList) getSupportFragmentManager().findFragmentById(R.id.fileList))
-				.onBackPressed();
-	}
-
 	private class DirectoryCreator implements Runnable {
 		private String mTargetPath;
 		private Account mAccount;