android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
| 4 ----
android/app/src/main/res/menu/navigation_menu.xml
| 6 +-----
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 38b4af6eb524754b4f89c4244ffc5540763ba4d4
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Mon Dec 9 19:34:21 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Tue Dec 10 17:09:31 2019 +0100
android: Enable the Remote server again.
Change-Id: I321a7d7fa03eeb498acd4cf33ceba601f9ad0426
Reviewed-on: https://gerrit.libreoffice.org/84870
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 7d1983207..037de08ad 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -270,12 +270,10 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
- /* FIXME disabled for the moment, enable when
menu_provider_owncloud is enabled
case R.id.menu_storage_preferences: {
startActivity(new Intent(LibreOfficeUIActivity.this,
DocumentProviderSettingsActivity.class));
return true;
}
- */
case R.id.menu_provider_documents: {
switchToDocumentProvider(documentProviderFactory.getProvider(0));
@@ -292,7 +290,6 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
return true;
}
- /* FIXME disabled for the moment, it's totally untested
case R.id.menu_provider_otg: {
switchToDocumentProvider(documentProviderFactory.getProvider(3));
return true;
@@ -302,7 +299,6 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
switchToDocumentProvider(documentProviderFactory.getProvider(4));
return true;
}
- */
default:
return false;
diff --git a/android/app/src/main/res/menu/navigation_menu.xml
b/android/app/src/main/res/menu/navigation_menu.xml
index e96c3374d..5d78aaf11 100644
--- a/android/app/src/main/res/menu/navigation_menu.xml
+++ b/android/app/src/main/res/menu/navigation_menu.xml
@@ -16,24 +16,20 @@
android:title="@string/external_sd_file_system"
android:icon="@drawable/ic_sd_card_black_24dp"/>
- <!-- FIXME these two are totally untested, let's disable for the moment
<item android:id="@+id/menu_provider_otg"
android:title="@string/otg_file_system"
android:icon="@drawable/ic_usb_black_24dp"/>
<item android:id="@+id/menu_provider_owncloud"
- android:title="@string/owncloud"
+ android:title="@string/remote_server"
android:icon="@drawable/ic_cloud_black_24dp"/>
- -->
</group>
- <!-- FIXME enable once the menu_provider_owncloud is enabled again
<group android:orderInCategory="100">
<item android:id="@+id/menu_storage_preferences"
android:title="@string/storage_provider_settings"
android:icon="@drawable/ic_settings_black_24dp"/>
</group>
- -->
</menu>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
