Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c413b3e8 authored by Alexander Milantev's avatar Alexander Milantev
Browse files

Enabled Settings Core activity embedding for Assistant 

Test: manual
Bug: 271260497

Change-Id: Ia5c308a45f4b0bde902c22da5352510413fbf018
parent 2034c0c3

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -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" />

res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>