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

Commit 3a93a909 authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge "Expose framework activities to Instant Apps" into oc-dev am: b157f08b 

am: 59551672

Change-Id: I231f32fe6ec5958ed88490da42dbd69e57956bb5
parents 7530670d 59551672

core/res/AndroidManifest.xml

+12 −6
Original line number Diff line number Diff line
@@ -3370,7 +3370,8 @@ 
                android:documentLaunchMode="never"

                android:relinquishTaskIdentity="true"

                android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                android:process=":ui">

                android:process=":ui"

                android:visibleToInstantApps="true">

            <intent-filter>

                <action android:name="android.intent.action.CHOOSER" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -3384,7 +3385,8 @@ 
                  android:documentLaunchMode="never"

                  android:relinquishTaskIdentity="true"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                  android:process=":ui">

                  android:process=":ui"

                  android:visibleToInstantApps="true">

            <intent-filter>

                <action android:name="android.intent.action.CHOOSE_ACCESSIBILITY_BUTTON" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -3445,7 +3447,8 @@ 
                android:exported="true"

                android:theme="@style/Theme.DeviceDefault.Light.Dialog"

                android:label="@string/choose_account_label"

                android:process=":ui">

                android:process=":ui"

                android:visibleToInstantApps="true">

        </activity>



        <activity android:name="android.accounts.ChooseTypeAndAccountActivity"
@@ -3453,14 +3456,16 @@ 
                android:exported="true"

                android:theme="@style/Theme.DeviceDefault.Light.Dialog"

                android:label="@string/choose_account_label"

                android:process=":ui">

                android:process=":ui"

                android:visibleToInstantApps="true">

        </activity>



        <activity android:name="android.accounts.ChooseAccountTypeActivity"

                android:excludeFromRecents="true"

                android:theme="@style/Theme.DeviceDefault.Light.Dialog"

                android:label="@string/choose_account_label"

                android:process=":ui">

                android:process=":ui"

                android:visibleToInstantApps="true">

        </activity>



        <activity android:name="android.accounts.CantAddAccountActivity"
@@ -3474,7 +3479,8 @@ 
                android:excludeFromRecents="true"

                android:exported="true"

                android:theme="@style/Theme.DeviceDefault.Light.DialogWhenLarge"

                android:process=":ui">

                android:process=":ui"

                android:visibleToInstantApps="true">

        </activity>



        <activity android:name="android.content.SyncActivityTooManyDeletes"