diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java
index 5abea711506..938e2a21d1a 100644
--- a/java/org/gnu/emacs/EmacsView.java
+++ b/java/org/gnu/emacs/EmacsView.java
@@ -24,10 +24,11 @@
import android.text.InputType;
import android.view.ContextMenu;
+import android.view.ContextThemeWrapper;
import android.view.DragEvent;
-import android.view.View;
import android.view.KeyEvent;
import android.view.MotionEvent;
+import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.WindowInsets;
@@ -127,32 +128,36 @@ public final class EmacsView extends ViewGroup
public
EmacsView (EmacsWindow window)
{
- super (EmacsService.SERVICE);
+ /* This is required to guarantee that popup menus respect the
+ default style. */
+ super (new ContextThemeWrapper (EmacsService.SERVICE,
+ R.style.EmacsStyle));
+ {
+ Object tem;
+ Context context;
- Object tem;
- Context context;
+ this.window = window;
+ this.damageRegion = new Region ();
- this.window = window;
- this.damageRegion = new Region ();
+ setFocusable (true);
+ setFocusableInTouchMode (true);
- setFocusable (true);
- setFocusableInTouchMode (true);
+ /* Create the surface view. */
+ this.surfaceView = new EmacsSurfaceView (this);
+ addView (this.surfaceView);
- /* Create the surface view. */
- this.surfaceView = new EmacsSurfaceView (this);
- addView (this.surfaceView);
+ /* Get rid of the default focus highlight. */
+ if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O)
+ setDefaultFocusHighlightEnabled (false);
- /* Get rid of the default focus highlight. */
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O)
- setDefaultFocusHighlightEnabled (false);
+ /* Obtain the input method manager. */
+ context = getContext ();
+ tem = context.getSystemService (Context.INPUT_METHOD_SERVICE);
+ imManager = (InputMethodManager) tem;
- /* Obtain the input method manager. */
- context = getContext ();
- tem = context.getSystemService (Context.INPUT_METHOD_SERVICE);
- imManager = (InputMethodManager) tem;
-
- /* Add this view as its own global layout listener. */
- getViewTreeObserver ().addOnGlobalLayoutListener (this);
+ /* Add this view as its own global layout listener. */
+ getViewTreeObserver ().addOnGlobalLayoutListener (this);
+ }
}
private void
diff --git a/java/res/values-v20/style.xml b/java/res/values-v20/style.xml
new file mode 100644
index 00000000000..285cd61ced6
--- /dev/null
+++ b/java/res/values-v20/style.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
diff --git a/java/res/values-v29/style.xml b/java/res/values-v29/style.xml
index 5e6700a27e0..0ecfa7fc103 100644
--- a/java/res/values-v29/style.xml
+++ b/java/res/values-v29/style.xml
@@ -18,14 +18,18 @@
along with GNU Emacs. If not, see . -->
-
+
diff --git a/java/res/values-v35/styles.xml b/java/res/values-v35/style.xml
similarity index 89%
rename from java/res/values-v35/styles.xml
rename to java/res/values-v35/style.xml
index c0dc6479e18..0f7aeea5081 100644
--- a/java/res/values-v35/styles.xml
+++ b/java/res/values-v35/style.xml
@@ -24,6 +24,9 @@
- false
- true
- ?android:attr/isLightTheme
+
+ - false