Remove drop-down list in action bar

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index bfac912..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. 
      * 

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index cc6944c..b90ebe4 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -802,6 +802,7 @@ public class FileDisplayActivity extends HookActivity implements
         if (listOfFiles != null) {  // should never be null, indeed
             setFile(listOfFiles.getCurrentFile());
         }
         if (listOfFiles != null) {  // should never be null, indeed
             setFile(listOfFiles.getCurrentFile());
         }

+        updateActionBarTitle();

         cleanSecondFragment();
 
     }
         cleanSecondFragment();
 
     }


@@ -1239,8 +1240,10 @@ public class FileDisplayActivity extends HookActivity implements
             // listOfFiles.listDirectory(root, MainApp.getOnlyOnDevice());
             setFile(listOfFiles.getCurrentFile());
             startSyncFolderOperation(root, false);
             // listOfFiles.listDirectory(root, MainApp.getOnlyOnDevice());
             setFile(listOfFiles.getCurrentFile());
             startSyncFolderOperation(root, false);

+            updateActionBarTitle();

         }
         cleanSecondFragment();
         }
         cleanSecondFragment();

+

     }
     
     
     }
     
     


@@ -1260,6 +1263,7 @@ public class FileDisplayActivity extends HookActivity implements
             Log_OC.e(TAG, "Unexpected null when accessing list fragment");
         }
         cleanSecondFragment();
             Log_OC.e(TAG, "Unexpected null when accessing list fragment");
         }
         cleanSecondFragment();

+

     }
 
 
     }
 
 


@@ -1272,7 +1276,7 @@ public class FileDisplayActivity extends HookActivity implements
     public void onBrowsedDownTo(OCFile directory) {
         pushDirname(directory);
         cleanSecondFragment();
     public void onBrowsedDownTo(OCFile directory) {
         pushDirname(directory);
         cleanSecondFragment();

-        
+        updateActionBarTitle();

         // Sync Folder
         startSyncFolderOperation(directory, false);
         
         // Sync Folder
         startSyncFolderOperation(directory, false);
         


@@ -1308,7 +1312,7 @@ public class FileDisplayActivity extends HookActivity implements
             OCFile currentDir = getCurrentDir();
             boolean noRoot = (currentDir != null && currentDir.getParentId() != 0);
 //            actionBar.setDisplayHomeAsUpEnabled(noRoot);
             OCFile currentDir = getCurrentDir();
             boolean noRoot = (currentDir != null && currentDir.getParentId() != 0);
 //            actionBar.setDisplayHomeAsUpEnabled(noRoot);

-//            actionBar.setDisplayShowTitleEnabled(!noRoot); 
+//            actionBar.setDisplayShowTitleEnabled(!noRoot);

             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
             if (!noRoot) {
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
             if (!noRoot) {


@@ -1319,8 +1323,9 @@ public class FileDisplayActivity extends HookActivity implements
                             getString(R.string.default_display_name_for_root_folder));
                 }
             }
                             getString(R.string.default_display_name_for_root_folder));
                 }
             }

-            actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD :
-                    ActionBar.NAVIGATION_MODE_LIST);
+            actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+//            actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD :
+//                    ActionBar.NAVIGATION_MODE_LIST);

             actionBar.setListNavigationCallbacks(mDirectories, this);
             // assuming mDirectories is updated
 
             actionBar.setListNavigationCallbacks(mDirectories, this);
             // assuming mDirectories is updated