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 . -->
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 @@
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
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 @@
+
+
+
+
+
+