android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderSettingsActivity.java
| 8 ++++++++
android/app/src/main/res/xml/documentprovider_preferences.xml
| 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 5d1f50c9757be8859a1282b8cd35a83dd8976cc2
Author: Jan Holesovsky <[email protected]>
AuthorDate: Thu Jan 2 17:59:23 2020 +0100
Commit: Jan Holesovsky <[email protected]>
CommitDate: Thu Jan 2 18:10:31 2020 +0100
android: Disable OTG also in the Provider settings.
Change-Id: Ic1fa98461f27cd849afcd7d56ecd58fc1a96fb10
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86138
Reviewed-by: Jan Holesovsky <[email protected]>
Tested-by: Jan Holesovsky <[email protected]>
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderSettingsActivity.java
b/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderSettingsActivity.java
index 243198d95..c7c1532b1 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderSettingsActivity.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderSettingsActivity.java
@@ -68,7 +68,10 @@ public class DocumentProviderSettingsActivity extends
AppCompatActivity {
addPreferencesFromResource(R.xml.documentprovider_preferences);
Preference extSDPreference =
findPreference(KEY_PREF_EXTERNAL_SD_PATH_URI);
+
+ /* FIXME fix or remove
Preference otgPreference = findPreference(KEY_PREF_OTG_PATH_URI);
+ */
extSDPreference.setOnPreferenceClickListener(new
Preference.OnPreferenceClickListener() {
@Override
@@ -78,6 +81,8 @@ public class DocumentProviderSettingsActivity extends
AppCompatActivity {
return true;
}
});
+
+ /* FIXME fix or remove
otgPreference.setOnPreferenceClickListener(new
Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
@@ -86,6 +91,7 @@ public class DocumentProviderSettingsActivity extends
AppCompatActivity {
return true;
}
});
+ */
}
private void startBrowserSelectorActivity(String prefKey, String mode)
{
@@ -97,3 +103,5 @@ public class DocumentProviderSettingsActivity extends
AppCompatActivity {
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/app/src/main/res/xml/documentprovider_preferences.xml
b/android/app/src/main/res/xml/documentprovider_preferences.xml
index 2c95da294..e4602c561 100644
--- a/android/app/src/main/res/xml/documentprovider_preferences.xml
+++ b/android/app/src/main/res/xml/documentprovider_preferences.xml
@@ -33,11 +33,11 @@
android:key="pref_extsd_path_uri"
android:title="@string/external_sd_path"
app:iconSpaceReserved="false" />
- <Preference
+ <!-- FIXME fix or remove Preference
android:key="pref_otg_path_uri"
android:summary="@string/otg_warning"
android:title="@string/otg_device_path"
- app:iconSpaceReserved="false" />
+ app:iconSpaceReserved="false" /-->
</PreferenceCategory>
</PreferenceScreen>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
