[Libreoffice-commits] core.git: android/source

[aleksandar-stefanovic]

 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b0005f4319acb0a5444453466f056d9b5b4c4a39
Author: aleksandar-stefanovic <theonewithideas at gmail.com>
Date:   Tue Mar 14 19:44:41 2017 +0100

    Made toolbar title use the name of the current dir
    
    It uses the name of the current directory, and if the directory is the
    root directory, it uses the app name instead.
    
    Change-Id: I1d8ac2545acb3e75be5b19fb5c208a8cb242de11
    Reviewed-on: https://gerrit.libreoffice.org/35201
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Aleksandar Stefanović <theonewithideas at gmail.com>

diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 4861a8e7468e..f2f408a7c331 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -103,6 +103,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
 
     private DrawerLayout drawerLayout;
     private NavigationView navigationDrawer;
+    private ActionBar actionBar;
     private ActionBarDrawerToggle drawerToggle;
     private RecyclerView fileRecyclerView;
     private RecyclerView recentRecyclerView;
@@ -136,7 +137,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
+        actionBar = getSupportActionBar();
 
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
@@ -373,11 +374,13 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
             recentRecyclerView.setVisibility(View.VISIBLE);
             findViewById(R.id.header_browser).setVisibility((View.VISIBLE));
             findViewById(R.id.header_recents).setVisibility((View.VISIBLE));
-
+            actionBar.setTitle(R.string.app_name);
         } else {
             recentRecyclerView.setVisibility(View.GONE);
             findViewById(R.id.header_browser).setVisibility((View.GONE));
             findViewById(R.id.header_recents).setVisibility((View.GONE));
+            actionBar.setTitle(dir.getName());
+
         }
 
         new AsyncTask<IFile, Void, Void>() {