PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enabled Settings Core activity embedding for Assistant" into udc-dev

Browse Source
This commit is contained in:
Alexander Milantev
2023-03-23 10:44:28 +00:00
committed by Android (Google) Code Review
parent b3ed786e76 c413b3e8e0
commit cb227a79a2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -178,6 +178,7 @@
android:exported="true"
android:enabled="false"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
android:knownActivityEmbeddingCerts="@array/config_known_host_certs"
android:permission="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK">
<intent-filter>
<action android:name="android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY" />
@@ -224,6 +225,7 @@
<activity android:name=".SubSettings"
android:exported="false"
android:theme="@style/Theme.SubSettings"
android:knownActivityEmbeddingCerts="@array/config_known_host_certs"
android:taskAffinity="com.android.settings.root" />
<activity android:name=".Settings$CreateShortcutActivity"
@@ -333,6 +335,7 @@
<activity android:name=".search.SearchResultTrampoline"
android:theme="@android:style/Theme.NoDisplay"
android:excludeFromRecents="true"
android:knownActivityEmbeddingCerts="@array/config_known_host_certs"
android:exported="true">
<intent-filter>
<action android:name="com.android.settings.SEARCH_RESULT_TRAMPOLINE" />
@@ -1628,6 +1631,7 @@
android:excludeFromRecents="true"
android:theme="@android:style/Theme.NoDisplay"
android:exported="true"
android:knownActivityEmbeddingCerts="@array/config_known_host_certs"
android:permission="android.permission.MODIFY_PHONE_STATE">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

6
res/values/config.xml
View File

@@ -704,4 +704,10 @@
<!-- Whether to display Cloned Apps page in Settings (Settings > Apps > Cloned Apps).-->
<bool name="config_cloned_apps_page_enabled">false</bool>
<!-- Certificates of apps which are allowed to use activity embedding with Settings.-->
<string-array name="config_known_host_certs" translatable="false">
<item></item>
</string-array>
</resources>