Android Manifest cleanup

* Remove `package` from manifest and from activity prefixes, gradle `namespace` will be used instead
* Removed deprecated `android.support.PARENT_ACTIVITY` metadata 
entries
* Make `MainActivity` and `SettingsActivity` launched in `singleTop` mode to avoid unnecessary activity restarts while navigating the app
This commit is contained in:
lynxnb 2022-08-17 12:54:07 +02:00
parent d128856c7d
commit d129fb09cd

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest 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" xmlns:tools="http://schemas.android.com/tools">
package="emu.skyline">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
@ -27,8 +26,9 @@
<profileable android:shell="true" /> <profileable android:shell="true" />
<activity <activity
android:name="emu.skyline.MainActivity" android:name=".MainActivity"
android:exported="true"> android:exported="true"
android:launchMode="singleTop">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -36,49 +36,39 @@
</activity> </activity>
<activity <activity
android:name="emu.skyline.SettingsActivity" android:name=".SettingsActivity"
android:exported="true" android:exported="true"
android:label="@string/settings" android:label="@string/settings"
android:parentActivityName="emu.skyline.MainActivity"> android:launchMode="singleTop"
<meta-data android:parentActivityName=".MainActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value="emu.skyline.MainActivity" />
</activity> </activity>
<activity <activity
android:name="emu.skyline.input.ControllerActivity" android:name=".input.ControllerActivity"
android:exported="true"> android:exported="true"
<meta-data android:parentActivityName=".SettingsActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value="emu.skyline.SettingsActivity" />
</activity> </activity>
<activity <activity
android:name="emu.skyline.preference.GpuDriverActivity" android:name=".preference.GpuDriverActivity"
android:exported="true"> android:exported="true"
<meta-data android:parentActivityName=".SettingsActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value="emu.skyline.SettingsActivity" />
</activity> </activity>
<activity <activity
android:name="emu.skyline.input.onscreen.OnScreenEditActivity" android:name=".input.onscreen.OnScreenEditActivity"
android:exported="true" android:exported="true"
android:screenOrientation="sensorLandscape" android:screenOrientation="sensorLandscape"
tools:ignore="LockedOrientationActivity"> tools:ignore="LockedOrientationActivity"
<meta-data android:parentActivityName=".input.ControllerActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value="emu.skyline.input.ControllerActivity" />
</activity> </activity>
<activity <activity
android:name="emu.skyline.EmulationActivity" android:name=".EmulationActivity"
android:configChanges="orientation|screenSize|uiMode" android:configChanges="orientation|screenSize|uiMode"
android:exported="true" android:exported="true"
android:launchMode="singleTask"> android:launchMode="singleTask"
<meta-data android:parentActivityName=".MainActivity">
android:name="android.support.PARENT_ACTIVITY"
android:value="emu.skyline.MainActivity" />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -114,7 +104,7 @@
</activity> </activity>
<provider <provider
android:name="emu.skyline.provider.DocumentsProvider" android:name=".provider.DocumentsProvider"
android:authorities="emu.skyline.provider" android:authorities="emu.skyline.provider"
android:exported="true" android:exported="true"
android:grantUriPermissions="true" android:grantUriPermissions="true"