diff options
author | Mert Tümer <merttumer7@gmail.com> | 2018-01-08 12:52:01 +0300 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-15 22:29:53 +0100 |
commit | 55ecc98376dbeffc366820e718fd906b8935a17b (patch) | |
tree | ebc793720305f36553ab5005d38ee99652928f4a /android | |
parent | change Not to Dont in tdf#36308 fix (diff) | |
download | core-55ecc98376dbeffc366820e718fd906b8935a17b.tar.gz core-55ecc98376dbeffc366820e718fd906b8935a17b.zip |
tdf#89639 added path text for the document browser
The patch was sent for the ULAKBIM/PARDUS project.
Signed-off-by: Mert Tümer <merttumer7@gmail.com>
Change-Id: I14ce3bb7c11f4cc2fe9194a99b433764209b1528
Reviewed-on: https://gerrit.libreoffice.org/47635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'android')
-rw-r--r-- | android/source/res/layout/activity_document_browser.xml | 9 | ||||
-rw-r--r-- | android/source/res/values/strings.xml | 1 | ||||
-rw-r--r-- | android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index fab1b095035e..9f62f5f22a3e 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -86,6 +86,15 @@ android:padding="16dp" android:textStyle="bold" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="14sp" + android:padding="7dp" + android:id="@+id/text_directory_path" + android:background="@color/background_normal" + /> + <!--Document browser--> <android.support.v7.widget.RecyclerView diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index 3f6955cd7a7b..1fb23a528c06 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -120,6 +120,7 @@ <string name="search_label">Go</string> <string name="directory_browser_label">Choose Directory</string> <string name="bad_directory">Invalid directory path</string> + <string name="current_dir">Current Directory:</string> <!-- Save Alert dialog strings --> <string name="save_alert_dialog_title">Save the document before closing?</string> diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 786b949bb504..530644667aa9 100644 --- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -464,12 +464,15 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings findViewById(R.id.header_browser).setVisibility((View.VISIBLE)); findViewById(R.id.header_recents).setVisibility((View.VISIBLE)); actionBar.setTitle(R.string.app_name); + findViewById(R.id.text_directory_path).setVisibility(View.GONE); } 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()); - + findViewById(R.id.text_directory_path).setVisibility(View.VISIBLE); + ((TextView)findViewById(R.id.text_directory_path)).setText(getString(R.string.current_dir) + + " " + dir.getUri().getPath()); } new AsyncTask<IFile, Void, Void>() { |