From ee63ca384ec54713122f38da4490fc43b1fb6b7c Mon Sep 17 00:00:00 2001 From: sspanak Date: Fri, 19 Apr 2024 16:14:59 +0300 Subject: [PATCH] added Android 12L support --- app/build.gradle | 3 +-- .../preferences/screens/setup/ItemSelectGlobalKeyboard.java | 2 ++ app/src/main/java/io/github/sspanak/tt9/ui/UI.java | 2 +- .../java/io/github/sspanak/tt9/ui/dialogs/AddWordDialog.java | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 00cbdf80..73e731f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,8 +59,7 @@ android { defaultConfig { applicationId PACKAGE_NAME minSdk 19 - //noinspection ExpiredTargetSdkVersion - targetSdk 30 + targetSdk 32 versionCode getVerCode() versionName getVerName() } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java index 71f591d4..e1802c94 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/setup/ItemSelectGlobalKeyboard.java @@ -18,6 +18,8 @@ class ItemSelectGlobalKeyboard extends ItemClickable { clickIntent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS); clickIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + clickIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); + clickIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY); } @Override diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/UI.java b/app/src/main/java/io/github/sspanak/tt9/ui/UI.java index 259ec976..3f4f87e0 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/UI.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/UI.java @@ -26,8 +26,8 @@ public class UI { public static void showSettingsScreen(InputMethodService ims) { Intent prefIntent = new Intent(ims, PreferencesActivity.class); prefIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + prefIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); prefIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY); - ims.hideWindow(); ims.startActivity(prefIntent); } diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/dialogs/AddWordDialog.java b/app/src/main/java/io/github/sspanak/tt9/ui/dialogs/AddWordDialog.java index de3ef589..655f21df 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/dialogs/AddWordDialog.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/dialogs/AddWordDialog.java @@ -99,6 +99,7 @@ public class AddWordDialog extends PopupDialog { public static void show(InputMethodService ims, int language, String currentWord) { Intent intent = new Intent(ims, PopupDialogActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY); intent.putExtra(PARAMETER_DIALOG_TYPE, TYPE); intent.putExtra(PARAMETER_LANGUAGE, language);