Merge pull request #479 from NordicSemiconductor/improvement/edge-to-…

…edge Edeg to edge support
NordicSemiconductor · Dec 9, 2024 · 4823d6d · 4823d6d
2 parents c62d9d8 + 5d7eed9
commit 4823d6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,8 +30,9 @@
   ~ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--
     This permission allows displaying foreground service notification.
@@ -47,7 +48,10 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/NordicTheme">
+        android:enableOnBackInvokedCallback="true"
+        android:theme="@style/NordicTheme"
+        tools:targetApi="tiramisu">
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:2.5-1")
+            from("no.nordicsemi.android.gradle:version-catalog:2.5-4")
         }
     }
 }