android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
| 3 ---
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
| 8 ++++----
android/app/src/main/res/menu/navigation_menu.xml
| 4 ++--
android/app/src/main/res/values/strings.xml
| 1 +
android/app/src/main/res/xml/libreoffice_preferences.xml
| 9 ++++++++-
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
| 8 +++-----
android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
| 5 ++++-
7 files changed, 22 insertions(+), 16 deletions(-)
New commits:
commit 05198a9723dec59eeae6e4ba9f3a9856938acc21
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Sat Mar 14 00:07:50 2020 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Mon Mar 16 09:51:27 2020 +0100
android: Re-introduce Settings in the Navigation menu.
Contains only the ability to turn on the chrome://inspect debugging even
in the production builds.
Change-Id: I2acc4a13851ed8140cb5b95712a684a56f29dfa2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90485
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
index 510979a7a..c51d098af 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
@@ -34,9 +34,6 @@ public class SettingsActivity extends AppCompatActivity {
if (!BuildConfig.DEBUG) {
findPreference("ENABLE_SHOW_DEBUG_INFO").setVisible(false);
}
- else {
- findPreference("ENABLE_CHROME_DEBUGGING").setVisible(false);
- }
}
@Override
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 c9989069a..1ef2acc45 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
@@ -272,14 +272,14 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
break;
*/
+ case R.id.action_settings:
+ startActivity(new Intent(getApplicationContext(),
SettingsActivity.class));
+ return true;
+
case R.id.action_about:
AboutDialogFragment aboutDialogFragment = new
AboutDialogFragment();
aboutDialogFragment.show(getSupportFragmentManager(),
"AboutDialogFragment");
return true;
-
- /*case R.id.action_settings:
- startActivity(new Intent(getApplicationContext(),
SettingsActivity.class));
- return true;*/
}
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 55f86fcab..b89655b9f 100644
--- a/android/app/src/main/res/menu/navigation_menu.xml
+++ b/android/app/src/main/res/menu/navigation_menu.xml
@@ -48,10 +48,10 @@
android:title="@string/sort_oldest"/>
</group>
</menu>
- </item>
+ </item-->
<item android:id="@+id/action_settings"
- android:title="@string/action_settings"/-->
+ android:title="@string/action_settings"/>
<item android:id="@+id/action_about"
android:title="@string/action_about"/>
diff --git a/android/app/src/main/res/values/strings.xml
b/android/app/src/main/res/values/strings.xml
index 663779278..29213c2df 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
<string name="list_view">List</string>
<string name="grid_view">Grid</string>
<string name="pref_category_explorer">File Manager Settings</string>
+ <string name="pref_category_editor">Editor Settings</string>
<string name="pref_show_hidden_files">Hidden Files/Folders</string>
<string name="pref_show_hidden_files_summary">Enable to show hidden
files/folders</string>
<string name="pref_sort_summary">Select how to order files: A-Z, by size
or by date.</string>
diff --git a/android/app/src/main/res/xml/libreoffice_preferences.xml
b/android/app/src/main/res/xml/libreoffice_preferences.xml
index 7ffdbd8dd..f8a3b14f5 100644
--- a/android/app/src/main/res/xml/libreoffice_preferences.xml
+++ b/android/app/src/main/res/xml/libreoffice_preferences.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:app="http://schemas.android.com/apk/res-auto";>
- <PreferenceCategory
+ <!--PreferenceCategory
android:title="@string/pref_category_explorer"
android:key="PREF_CATEGORY_EXPLORER"
app:iconSpaceReserved="false" >
@@ -29,6 +29,13 @@
android:defaultValue="false"
app:iconSpaceReserved="false" />
+ </PreferenceCategory-->
+
+ <PreferenceCategory
+ android:title="@string/pref_category_editor"
+ android:key="PREF_CATEGORY_EDITOR"
+ app:iconSpaceReserved="false" >
+
<CheckBoxPreference
android:title="@string/pref_show_debug_info"
android:key="ENABLE_SHOW_DEBUG_INFO"
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index d54ab18ce..470431e5b 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -348,13 +348,11 @@ public class LOActivity extends AppCompatActivity {
webSettings.setJavaScriptEnabled(true);
mWebView.addJavascriptInterface(this, "LOOLMessageHandler");
- boolean isChromeDebugEnabled =
sPrefs.getBoolean("ENABLE_CHROME_DEBUGGING", false);
// allow debugging (when building the debug version); see details in
//
https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- if ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)
!= 0 || isChromeDebugEnabled) {
- WebView.setWebContentsDebuggingEnabled(true);
- }
+ boolean isChromeDebugEnabled =
sPrefs.getBoolean("ENABLE_CHROME_DEBUGGING", false);
+ if ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) !=
0 || isChromeDebugEnabled) {
+ WebView.setWebContentsDebuggingEnabled(true);
}
getMainHandler();
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
index 761d73c07..0767fc656 100644
---
a/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
+++
b/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
@@ -42,11 +42,14 @@ public class SlideShowActivity extends AppCompatActivity {
}
Log.d(TAG, "SlideShow Svg Uri "+slidesSvgUri);
SharedPreferences sPrefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
- boolean isChromeDebugEnabled =
sPrefs.getBoolean("ENABLE_CHROME_DEBUGGING", false);
+ // allow debugging (when building the debug version); see details in
+ //
https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
+ boolean isChromeDebugEnabled =
sPrefs.getBoolean("ENABLE_CHROME_DEBUGGING", false);
if ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) !=
0 || isChromeDebugEnabled) {
WebView.setWebContentsDebuggingEnabled(true);
}
+
slideShowWebView.setBackgroundColor(Color.BLACK);
WebSettings slideShowWebViewSettings = slideShowWebView.getSettings();
slideShowWebViewSettings.setLoadWithOverviewMode(true);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
