Remove code related with action bar folder list

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 135eeea..0385833 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -361,9 +361,9 @@ public class FileActivity extends ActionBarActivity
             /** Called when a drawer has settled in a completely closed state. */
             public void onDrawerClosed(View view) {
                 super.onDrawerClosed(view);
             /** Called when a drawer has settled in a completely closed state. */
             public void onDrawerClosed(View view) {
                 super.onDrawerClosed(view);

+                updateActionBarTitle();

                 getSupportActionBar().setDisplayShowTitleEnabled(true);
                 getSupportActionBar().setDisplayShowTitleEnabled(true);

-                getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-                //initFragmentsWithFile();
+                getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);

                 invalidateOptionsMenu();
             }
 
                 invalidateOptionsMenu();
             }
 


@@ -384,6 +384,14 @@ public class FileActivity extends ActionBarActivity
         mDrawerLayout.setDrawerListener(mDrawerToggle);
     }
 
         mDrawerLayout.setDrawerListener(mDrawerToggle);
     }
 

+    protected void updateActionBarTitle(){
+        if (mFile.getParentId() == 0) {
+            getSupportActionBar().setTitle(getString(
+                    R.string.default_display_name_for_root_folder));
+        } else {
+            getSupportActionBar().setTitle(mFile.getFileName().toString());
+        }
+    }

     /**
      *  Sets and validates the ownCloud {@link Account} associated to the Activity. 
      * 
     /**
      *  Sets and validates the ownCloud {@link Account} associated to the Activity. 
      * 


@@ -609,8 +617,8 @@ public class FileActivity extends ActionBarActivity
      */
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
      */
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {

-        Log_OC.d(TAG, "Received result of operation in FileActivity - common behaviour for all the " +
-                "FileActivities ");
+        Log_OC.d(TAG, "Received result of operation in FileActivity - common behaviour for all the "
+                + "FileActivities ");

         
         mFileOperationsHelper.setOpIdWaitingFor(Long.MAX_VALUE);
         
         
         mFileOperationsHelper.setOpIdWaitingFor(Long.MAX_VALUE);