From d5676d683f031a2d23f4e01e0ada0afd58dc9b89 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 10 Feb 2024 17:33:42 +0100
Subject: Fix compatibility with Android 3.0

Incompatible APIs were used in the custom layouts and the extra keys
options.

Add @TargetApi annotations to help catch similar issues in the future
with the help of 'gradle lint'.
---
 srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java | 2 +-
 srcs/juloo.keyboard2/prefs/LayoutsPreference.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'srcs/juloo.keyboard2/prefs')

diff --git a/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java
index 9d8395f..cf47d46 100644
--- a/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/prefs/CustomExtraKeysPreference.java
@@ -51,7 +51,7 @@ public class CustomExtraKeysPreference extends ListGroupPreference<String>
   void select(final SelectionCallback<String> callback)
   {
     new AlertDialog.Builder(getContext())
-      .setView(R.layout.dialog_edit_text)
+      .setView(View.inflate(getContext(), R.layout.dialog_edit_text, null))
       .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
         public void onClick(DialogInterface dialog, int which)
         {
diff --git a/srcs/juloo.keyboard2/prefs/LayoutsPreference.java b/srcs/juloo.keyboard2/prefs/LayoutsPreference.java
index 842a2f2..c1a863f 100644
--- a/srcs/juloo.keyboard2/prefs/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/prefs/LayoutsPreference.java
@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -149,7 +150,7 @@ public class LayoutsPreference extends ListGroupPreference<LayoutsPreference.Lay
   {
     ArrayAdapter layouts = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, _layout_display_names);
     new AlertDialog.Builder(getContext())
-      .setView(R.layout.dialog_edit_text)
+      .setView(View.inflate(getContext(), R.layout.dialog_edit_text, null))
       .setAdapter(layouts, new DialogInterface.OnClickListener(){
         public void onClick(DialogInterface _dialog, int which)
         {
-- 
cgit v1.2.3