Skip to content

Commit b08e417

Browse files
MHummMHumm
committed
Update FMX demos for Android 12+
Added necessary manifest declaration to make these demos Android 12+ compatible
1 parent 5106814 commit b08e417

File tree

2 files changed

+88
-86
lines changed

2 files changed

+88
-86
lines changed

‎Demos/Cipher_FMX/AndroidManifest.template.xml‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,43 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- BEGIN_INCLUDE(manifest) -->
3-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="%package%"
5-
android:versionCode="%versionCode%"
6-
android:versionName="%versionName%"
7-
android:installLocation="%installLocation%">
8-
9-
<!-- This is the platform API where NativeActivity was introduced. -->
10-
<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" />
11-
<%uses-permission%>
12-
<uses-feature android:glEsVersion="0x00020000" android:required="True"/>
13-
<application android:persistent="%persistent%"
14-
android:restoreAnyVersion="%restoreAnyVersion%"
15-
android:label="%label%"
16-
android:debuggable="%debuggable%"
17-
android:largeHeap="%largeHeap%"
18-
android:icon="%icon%"
19-
android:theme="%theme%"
20-
android:hardwareAccelerated="%hardwareAccelerated%">
21-
22-
<%application-meta-data%>
23-
<%services%>
24-
<!-- Our activity is a subclass of the built-in NativeActivity framework class.
25-
This will take care of integrating with our NDK code. -->
26-
<activity android:name="com.embarcadero.firemonkey.FMXNativeActivity"
27-
android:label="%activityLabel%"
28-
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
29-
android:launchMode="singleTask">
30-
<!-- Tell NativeActivity the name of our .so -->
31-
<meta-data android:name="android.app.lib_name"
32-
android:value="%libNameValue%" />
33-
<intent-filter>
34-
<action android:name="android.intent.action.MAIN" />
35-
<category android:name="android.intent.category.LAUNCHER" />
36-
</intent-filter>
37-
</activity>
38-
<%activity%>
39-
<%receivers%>
40-
</application>
41-
</manifest>
42-
<!-- END_INCLUDE(manifest) -->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- BEGIN_INCLUDE(manifest) -->
3+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4+
package="%package%"
5+
android:versionCode="%versionCode%"
6+
android:versionName="%versionName%"
7+
android:installLocation="%installLocation%">
8+
9+
<!-- This is the platform API where NativeActivity was introduced. -->
10+
<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" />
11+
<%uses-permission%>
12+
<uses-feature android:glEsVersion="0x00020000" android:required="True"/>
13+
<application android:persistent="%persistent%"
14+
android:restoreAnyVersion="%restoreAnyVersion%"
15+
android:label="%label%"
16+
android:debuggable="%debuggable%"
17+
android:largeHeap="%largeHeap%"
18+
android:icon="%icon%"
19+
android:theme="%theme%"
20+
android:hardwareAccelerated="%hardwareAccelerated%">
21+
22+
<%application-meta-data%>
23+
<%services%>
24+
<!-- Our activity is a subclass of the built-in NativeActivity framework class.
25+
This will take care of integrating with our NDK code. -->
26+
<activity android:name="com.embarcadero.firemonkey.FMXNativeActivity"
27+
android:exported="true"
28+
android:label="%activityLabel%"
29+
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
30+
android:launchMode="singleTask">
31+
<!-- Tell NativeActivity the name of our .so -->
32+
<meta-data android:name="android.app.lib_name"
33+
android:value="%libNameValue%" />
34+
<intent-filter>
35+
<action android:name="android.intent.action.MAIN" />
36+
<category android:name="android.intent.category.LAUNCHER" />
37+
</intent-filter>
38+
</activity>
39+
<%activity%>
40+
<%receivers%>
41+
</application>
42+
</manifest>
43+
<!-- END_INCLUDE(manifest) -->

‎Demos/Hash_FMX/AndroidManifest.template.xml‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- BEGIN_INCLUDE(manifest) -->
3-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="%package%"
5-
android:versionCode="%versionCode%"
6-
android:versionName="%versionName%"
7-
android:installLocation="%installLocation%">
8-
9-
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="%targetSdkVersion%" />
10-
<!--<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" /> -->
11-
<%uses-permission%>
12-
<uses-feature android:glEsVersion="0x00020000" android:required="True"/>
13-
<application android:persistent="%persistent%"
14-
android:restoreAnyVersion="%restoreAnyVersion%"
15-
android:label="%label%"
16-
android:debuggable="%debuggable%"
17-
android:largeHeap="%largeHeap%"
18-
android:icon="%icon%"
19-
android:theme="%theme%"
20-
android:hardwareAccelerated="%hardwareAccelerated%"
21-
android:resizeableActivity="false">
22-
23-
<%provider%>
24-
<%application-meta-data%>
25-
<%services%>
26-
<!-- Our activity is a subclass of the built-in NativeActivity framework class.
27-
This will take care of integrating with our NDK code. -->
28-
<activity android:name="com.embarcadero.firemonkey.FMXNativeActivity"
29-
android:label="%activityLabel%"
30-
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
31-
android:launchMode="singleTask">
32-
<!-- Tell NativeActivity the name of our .so -->
33-
<meta-data android:name="android.app.lib_name"
34-
android:value="%libNameValue%" />
35-
<intent-filter>
36-
<action android:name="android.intent.action.MAIN" />
37-
<category android:name="android.intent.category.LAUNCHER" />
38-
</intent-filter>
39-
</activity>
40-
<%activity%>
41-
<%receivers%>
42-
</application>
43-
</manifest>
44-
<!-- END_INCLUDE(manifest) -->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- BEGIN_INCLUDE(manifest) -->
3+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4+
package="%package%"
5+
android:versionCode="%versionCode%"
6+
android:versionName="%versionName%"
7+
android:installLocation="%installLocation%">
8+
9+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="%targetSdkVersion%" />
10+
<!--<uses-sdk android:minSdkVersion="%minSdkVersion%" android:targetSdkVersion="%targetSdkVersion%" /> -->
11+
<%uses-permission%>
12+
<uses-feature android:glEsVersion="0x00020000" android:required="True"/>
13+
<application android:persistent="%persistent%"
14+
android:restoreAnyVersion="%restoreAnyVersion%"
15+
android:label="%label%"
16+
android:debuggable="%debuggable%"
17+
android:largeHeap="%largeHeap%"
18+
android:icon="%icon%"
19+
android:theme="%theme%"
20+
android:hardwareAccelerated="%hardwareAccelerated%"
21+
android:resizeableActivity="false">
22+
23+
<%provider%>
24+
<%application-meta-data%>
25+
<%services%>
26+
<!-- Our activity is a subclass of the built-in NativeActivity framework class.
27+
This will take care of integrating with our NDK code. -->
28+
<activity android:name="com.embarcadero.firemonkey.FMXNativeActivity"
29+
android:exported="true"
30+
android:label="%activityLabel%"
31+
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
32+
android:launchMode="singleTask">
33+
<!-- Tell NativeActivity the name of our .so -->
34+
<meta-data android:name="android.app.lib_name"
35+
android:value="%libNameValue%" />
36+
<intent-filter>
37+
<action android:name="android.intent.action.MAIN" />
38+
<category android:name="android.intent.category.LAUNCHER" />
39+
</intent-filter>
40+
</activity>
41+
<%activity%>
42+
<%receivers%>
43+
</application>
44+
</manifest>
45+
<!-- END_INCLUDE(manifest) -->

0 commit comments

Comments
 (0)