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

Commit 11b35dfc authored by Jelle Fresen's avatar Jelle Fresen
Browse files

tools:replace the theme of ComponentActivity in core/tests 

Avoids merging problems when `androidx.compose.ui:ui-test-manifest` starts defining an explicit theme for ComponentActivity.

Bug: 388031988
Flag: TEST_ONLY
Change-Id: Ia621a2859da8962f930d8c5cf0f08df245746294
parent 6713bf76

packages/SystemUI/compose/core/tests/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.compose.core.tests" >



    <application>
@@ -23,7 +24,8 @@ 
        <activity

            android:name="androidx.activity.ComponentActivity"

            android:theme="@android:style/Theme.DeviceDefault.DayNight"

            android:exported="true" />

            android:exported="true"

            tools:replace="android:theme" />

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"