citron/emu
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emu synced 2025-05-13 03:10:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into 'master'

Browse source 
Add Samsung Game Hub support, GAME category, optional NFC, and minor cleanup

See merge request citron/emu!1
This commit is contained in:
Zephyron 2025-05-03 08:51:10 +00:00
commit 6969005c54
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/android/app/src/main/AndroidManifest.xml
View file

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2023 yuzu Emulator Project
SPDX-License-Identifier: GPL-3.0-or-later
-->
<!-- SPDX-FileCopyrightText: 2023 yuzu Emulator Project
SPDX-License-Identifier: GPL-3.0-or-later -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.gamepad" android:required="false" />
<uses-feature android:name="android.software.leanback" android:required="false" />
<uses-feature android:name="android.hardware.vulkan.version" android:version="0x401000" android:required="true" />
<!-- Required Permissions for the app -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<!-- Permissions for NFC (only if needed) -->
<uses-permission android:name="android.permission.NFC" android:required="false" />
<application
android:name="org.citron.citron_emu.CitronApplication"
android:label="@string/app_name_suffixed"
@ -31,28 +31,37 @@ SPDX-License-Identifier: GPL-3.0-or-later
android:dataExtractionRules="@xml/data_extraction_rules_api_31"
android:enableOnBackInvokedCallback="true">
<meta-data android:name="android.game_mode_config"
<!-- Samsung Gaming Hub specific metadata -->
<meta-data
android:name="com.samsung.android.gamehub"
android:value="true" />
<!-- Game Mode configuration -->
<meta-data
android:name="android.game_mode_config"
android:resource="@xml/game_mode_config" />
<!-- Main Activity -->
<activity
android:name="org.citron.citron_emu.ui.main.MainActivity"
android:exported="true"
android:theme="@style/Theme.Citron.Splash.Main">
<!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.GAME" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
</activity>
<!-- Settings Activity -->
<activity
android:name="org.citron.citron_emu.features.settings.ui.SettingsActivity"
android:theme="@style/Theme.Citron.Main"
android:label="@string/preferences_settings"/>
android:label="@string/preferences_settings" />
<!-- Emulation Activity -->
<activity
android:name="org.citron.citron_emu.activities.EmulationActivity"
android:theme="@style/Theme.Citron.Main"
@ -72,7 +81,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<category android:name="android.intent.category.DEFAULT" />
<data
android:mimeType="application/octet-stream"
android:scheme="content"/>
android:scheme="content" />
</intent-filter>
<meta-data
@ -80,6 +89,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
android:resource="@xml/nfc_tech_filter" />
</activity>
<!-- Document Provider -->
<provider
android:name=".features.DocumentProvider"
android:authorities="${applicationId}.user"