From a105cadcc9d65d64551911a0103c1edd965ffa53 Mon Sep 17 00:00:00 2001 From: Kaarel Kaljurand Date: Sat, 24 Jun 2023 22:03:49 +0200 Subject: [PATCH] targetSdkVersion 33 -> 34 --- app/build.gradle | 6 +++--- .../speak/activity/AbstractRecognizerIntentActivity.java | 3 +-- speechutils | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e650e959..a43ca0af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,9 @@ android { defaultConfig { applicationId 'ee.ioc.phon.android.speak' minSdkVersion 24 - targetSdkVersion 33 - versionCode 1906 - versionName '1.9.06' + targetSdkVersion 34 + versionCode 1907 + versionName '1.9.07' vectorDrawables.useSupportLibrary = true // Keep only en and et resources resConfigs 'en', 'et' diff --git a/app/src/main/java/ee/ioc/phon/android/speak/activity/AbstractRecognizerIntentActivity.java b/app/src/main/java/ee/ioc/phon/android/speak/activity/AbstractRecognizerIntentActivity.java index a5ff0f4c..b97d2436 100644 --- a/app/src/main/java/ee/ioc/phon/android/speak/activity/AbstractRecognizerIntentActivity.java +++ b/app/src/main/java/ee/ioc/phon/android/speak/activity/AbstractRecognizerIntentActivity.java @@ -24,7 +24,6 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -553,7 +552,7 @@ private void handleResultByLaunchIntent(String result) { boolean isFinish = true; if (mExtras.containsKey(Extras.EXTRA_FINISH_AFTER_LAUNCH_INTENT)) { isFinish = mExtras.getBoolean(Extras.EXTRA_FINISH_AFTER_LAUNCH_INTENT, true); - } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInMultiWindowMode()) { + } else if (isInMultiWindowMode()) { isFinish = false; } if (isFinish) { diff --git a/speechutils b/speechutils index 51e1c4c2..7c5f2944 160000 --- a/speechutils +++ b/speechutils @@ -1 +1 @@ -Subproject commit 51e1c4c25d66eb832a3840d8fd25c13939ac8913 +Subproject commit 7c5f2944ffe08184a97a93cefa924773dfea91b8