Merge branch 'adb/add-transport-list-activity' of https://github.com/deltachat/deltachat-android into adb/add-transport-list-activity

This commit is contained in:
adbenitez
2025-12-04 20:12:14 +01:00
2 changed files with 8 additions and 3 deletions
+1
View File
@@ -828,6 +828,7 @@
<string name="pref_show_emails_accepted_contacts">For accepted contacts</string>
<string name="pref_show_emails_all">All</string>
<string name="pref_experimental_features">Experimental Features</string>
<string name="pref_experimental_features_explain">These features may be unstable and may be changed or removed</string>
<string name="pref_on_demand_location_streaming">On-demand Location Streaming</string>
<!-- deprecated -->
<string name="pref_developer_mode">Developer Mode</string>
+7 -3
View File
@@ -23,9 +23,9 @@
<PreferenceCategory android:title="@string/pref_experimental_features">
<Preference android:key="pref_webxdc_store_url"
android:title="@string/webxdc_store_url"
android:summary="@string/none"/>
<Preference
android:summary="@string/pref_experimental_features_explain"
android:selectable="false" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
@@ -42,6 +42,10 @@
android:key="pref_location_streaming_enabled"
android:title="@string/pref_on_demand_location_streaming"/>
<Preference android:key="pref_webxdc_store_url"
android:title="@string/webxdc_store_url"
android:summary="@string/none"/>
</PreferenceCategory>
<PreferenceCategory>