Merge branch '0000-u-keep-same-process' into 'main'

Don't execute MainSettingsActivity in a different process

See merge request e/os/ntfy-android!13
This commit is contained in:
Jonathan Klee 2024-09-26 08:55:37 +00:00
commit 18fb197507

View file

@ -180,14 +180,12 @@
<activity <activity
android:name=".ui.MainSettingsActivity" android:name=".ui.MainSettingsActivity"
android:theme="@style/PreferenceTheme" android:theme="@style/PreferenceTheme"/>
android:process=":ui"/>
<activity-alias <activity-alias
android:name=".ui.SettingsActivityLink" android:name=".ui.SettingsActivityLink"
android:exported="true" android:exported="true"
android:label="@string/eos_settings_title" android:label="@string/eos_settings_title"
android:process=":ui"
android:targetActivity=".ui.MainSettingsActivity"> android:targetActivity=".ui.MainSettingsActivity">
<intent-filter> <intent-filter>
<action android:name="com.android.settings.action.EXTRA_SETTINGS" /> <action android:name="com.android.settings.action.EXTRA_SETTINGS" />