Skip to content

Commit 4823d6d

Browse files
authored
Merge pull request #479 from NordicSemiconductor/improvement/edge-to-edge
Edeg to edge support
2 parents c62d9d8 + 5d7eed9 commit 4823d6d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

app/src/main/AndroidManifest.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
~ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131
-->
3232

33-
<manifest xmlns:tools="http://schemas.android.com/tools"
34-
xmlns:android="http://schemas.android.com/apk/res/android">
33+
<manifest
34+
xmlns:android="http://schemas.android.com/apk/res/android"
35+
xmlns:tools="http://schemas.android.com/tools">
3536

3637
<!--
3738
This permission allows displaying foreground service notification.
@@ -47,7 +48,10 @@
4748
android:label="@string/app_name"
4849
android:roundIcon="@mipmap/ic_launcher_round"
4950
android:supportsRtl="true"
50-
android:theme="@style/NordicTheme">
51+
android:enableOnBackInvokedCallback="true"
52+
android:theme="@style/NordicTheme"
53+
tools:targetApi="tiramisu">
54+
5155
<activity
5256
android:name=".MainActivity"
5357
android:exported="true"

settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
1616
}
1717
versionCatalogs {
1818
create("libs") {
19-
from("no.nordicsemi.android.gradle:version-catalog:2.5-1")
19+
from("no.nordicsemi.android.gradle:version-catalog:2.5-4")
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)