[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android 194b3f948cb 4/7: Update Android port
From: |
Po Lu |
Subject: |
feature/android 194b3f948cb 4/7: Update Android port |
Date: |
Wed, 1 Mar 2023 03:00:47 -0500 (EST) |
branch: feature/android
commit 194b3f948cba9f6da0e5d3b36ada8ab9ca74d482
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Update Android port
* java/AndroidManifest.xml.in: Specify @style/EmacsStyle.
* java/org/gnu/emacs/EmacsActivity.java (onCreate): Stop setting
the theme here.
* java/res/values-v11/style.xml:
* java/res/values-v14/style.xml:
* java/res/values-v29/style.xml:
* java/res/values/style.xml: Extract style resources into
res/values.
---
java/AndroidManifest.xml.in | 2 +-
java/org/gnu/emacs/EmacsActivity.java | 7 -------
java/res/values-v11/style.xml | 23 +++++++++++++++++++++++
java/res/values-v14/style.xml | 24 ++++++++++++++++++++++++
java/res/values-v29/style.xml | 30 ++++++++++++++++++++++++++++++
java/res/values/style.xml | 25 +++++++++++++++++++++++++
6 files changed, 103 insertions(+), 8 deletions(-)
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index 1da3646e2f5..4ebfe470c0a 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -67,7 +67,7 @@ along with GNU Emacs. If not, see
<https://www.gnu.org/licenses/>. -->
android:icon="@drawable/emacs"
android:hardwareAccelerated="true"
android:supportsRtl="true"
- android:theme="@android:style/Theme"
+ android:theme="@style/EmacsStyle"
android:debuggable="@ANDROID_DEBUGGABLE@"
android:extractNativeLibs="true">
diff --git a/java/org/gnu/emacs/EmacsActivity.java
b/java/org/gnu/emacs/EmacsActivity.java
index 0ee8c239899..1c5d7605caa 100644
--- a/java/org/gnu/emacs/EmacsActivity.java
+++ b/java/org/gnu/emacs/EmacsActivity.java
@@ -187,13 +187,6 @@ public class EmacsActivity extends Activity
= intent.getBooleanExtra ("org.gnu.emacs.START_DASH_Q",
false);
- /* Set the theme to one without a title bar. */
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
- setTheme (android.R.style.Theme_DeviceDefault_NoActionBar);
- else
- setTheme (android.R.style.Theme_NoTitleBar);
-
params = new FrameLayout.LayoutParams (LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT);
diff --git a/java/res/values-v11/style.xml b/java/res/values-v11/style.xml
new file mode 100644
index 00000000000..50cf96e8bc5
--- /dev/null
+++ b/java/res/values-v11/style.xml
@@ -0,0 +1,23 @@
+<!-- Style resources for GNU Emacs on Android.
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
+
+<resources>
+ <!-- Style used for popup menus and relatives on Android 3.x. -->
+ <style name="EmacsStyle" parent="@android:style/Theme.Holo.NoActionBar"/>
+</resources>
diff --git a/java/res/values-v14/style.xml b/java/res/values-v14/style.xml
new file mode 100644
index 00000000000..4124887ab5a
--- /dev/null
+++ b/java/res/values-v14/style.xml
@@ -0,0 +1,24 @@
+<!-- Style resources for GNU Emacs on Android.
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
+
+<resources>
+ <!-- Style used for popup menus and relatives between Android 4.0
+ and Android 10. -->
+ <style name="EmacsStyle"
parent="@android:style/Theme.DeviceDefault.NoActionBar"/>
+</resources>
diff --git a/java/res/values-v29/style.xml b/java/res/values-v29/style.xml
new file mode 100644
index 00000000000..cd4a6dd1fec
--- /dev/null
+++ b/java/res/values-v29/style.xml
@@ -0,0 +1,30 @@
+<!-- Style resources for GNU Emacs on Android.
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
+
+<resources>
+ <!-- Style used for popup menus and relatives from Android 10.0
+ onwards-->
+ <style name="EmacsStyle"
parent="@android:style/Theme.DeviceDefault.DayNight">
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
+
+ <!-- Required to make sure the status bar text remains legible. -->
+ <item name="android:statusBarColor">@android:color/black</item>
+ </style>
+</resources>
diff --git a/java/res/values/style.xml b/java/res/values/style.xml
new file mode 100644
index 00000000000..396b7d8da39
--- /dev/null
+++ b/java/res/values/style.xml
@@ -0,0 +1,25 @@
+<!-- Style resources for GNU Emacs on Android.
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
+
+<resources>
+ <!-- Style used for popup menus and relatives on Android 2.2 and
+ 2.3. Styles used for newer Android versions are defined in
+ the res/values- directories for their respective API levels. -->
+ <style name="EmacsStyle" parent="@android:style/Theme.NoTitleBar"/>
+</resources>
- feature/android updated (03c0cb86713 -> a0c3643abde), Po Lu, 2023/03/01
- feature/android 15bcb446be2 3/7: Update Android port, Po Lu, 2023/03/01
- feature/android ad8e12b9f99 5/7: Update Android port, Po Lu, 2023/03/01
- feature/android f8a2619d981 2/7: More fixes to JNI error checking, Po Lu, 2023/03/01
- feature/android 920168c5d87 6/7: Fix mostlyclean rules, Po Lu, 2023/03/01
- feature/android 194b3f948cb 4/7: Update Android port,
Po Lu <=
- feature/android 49d5aa36579 1/7: Merge remote-tracking branch 'origin/master' into feature/android, Po Lu, 2023/03/01
- feature/android a0c3643abde 7/7: Merge remote-tracking branch 'origin/master' into feature/android, Po Lu, 2023/03/01