cached instant upload

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

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
index 08710c5..f5664ea 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
@@ -17,37 +17,67 @@
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r

-\r
+import android.content.Intent;\r

 import android.os.Bundle;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.os.Bundle;\r
 import android.support.v4.app.FragmentTransaction;\r

-import android.view.Window;\r

 \r
 \r

+import com.actionbarsherlock.app.ActionBar;\r

 import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r

+import com.actionbarsherlock.view.MenuItem;\r

 \r
 import eu.alefzero.owncloud.R;\r
 \r
 import eu.alefzero.owncloud.R;\r

-import eu.alefzero.owncloud.ui.fragment.FileDetail;\r
+import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;\r

 \r
 /**\r
 \r
 /**\r

- * This activity displays the details of a file like\r
- * its name, its size and so on.\r
+ * This activity displays the details of a file like its name, its size and so\r
+ * on.\r
+ * \r

  * @author Bartek Przybylski\r
  * @author Bartek Przybylski\r

- *\r
+ * \r

  */\r
 public class FileDetailActivity extends SherlockFragmentActivity {\r
  */\r
 public class FileDetailActivity extends SherlockFragmentActivity {\r

-  private FileDetail mFileDetail;\r
-  \r
-@Override\r
-protected void onCreate(Bundle savedInstanceState) {\r
-  // TODO Auto-generated method stub\r
-  super.onCreate(savedInstanceState);\r
-  getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
-  setContentView(R.layout.file_activity_details);\r
-  \r
-  mFileDetail = new FileDetail();\r
-  FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
-  ft.add(R.id.fileDetail, mFileDetail);\r
-  ft.commit();\r
-  \r
-}\r
+    private FileDetailFragment mFileDetail;\r
+\r
+    @Override\r
+    protected void onCreate(Bundle savedInstanceState) {\r
+        super.onCreate(savedInstanceState);\r
+        setContentView(R.layout.file_activity_details);\r
+\r
+        ActionBar actionBar = getSupportActionBar();\r
+        actionBar.setDisplayHomeAsUpEnabled(true);\r
+        \r
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
+        mFileDetail = new FileDetailFragment();\r
+        ft.add(R.id.fragment, mFileDetail, "FileDetails");\r
+        ft.commit();\r
+\r
+    }\r
+\r
+    @Override\r
+    public boolean onOptionsItemSelected(MenuItem item) {\r
+        boolean returnValue = false;\r
+        \r
+        switch(item.getItemId()){\r
+        case android.R.id.home:\r
+            Intent intent = new Intent(this, FileDisplayActivity.class);\r
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
+            intent.putExtra(FileDetailFragment.EXTRA_FILE, mFileDetail.getDisplayedFile());\r
+            startActivity(intent);\r
+            finish();\r
+            returnValue = true;\r
+        }\r
+        \r
+        return returnValue;\r
+    }\r
+\r
+\r
+\r
+    @Override\r
+    protected void onResume() {\r
+        super.onResume();\r
+        mFileDetail.updateFileDetails(getIntent());\r
+    }\r
+    \r
+    \r

 \r
 }\r
 \r
 }\r