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

Commit c67f050c authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Remove the <application> tag from SystemUIComposeFeatures" into... 

Merge "Remove the <application> tag from SystemUIComposeFeatures" into tm-qpr-dev am: 4c42ecfe am: ebf8a06f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20708647



Change-Id: I626823b387ba7d183d783a0076df1334836dc451
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3df177f ebf8a06f

packages/SystemUI/compose/features/AndroidManifest.xml

+1 −38
Original line number Diff line number Diff line
@@ -16,43 +16,6 @@ 
-->



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

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



    package="com.android.systemui.compose.features">

    <application

        android:name="android.app.Application"

        android:appComponentFactory="androidx.core.app.AppComponentFactory"

        tools:replace="android:name,android:appComponentFactory">

        <!-- Disable providers from SystemUI -->

        <provider android:name="com.android.systemui.keyguard.KeyguardSliceProvider"

            android:authorities="com.android.systemui.test.keyguard.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.google.android.systemui.keyguard.KeyguardSliceProviderGoogle"

            android:authorities="com.android.systemui.test.keyguard.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.android.systemui.keyguard.KeyguardQuickAffordanceProvider"

            android:authorities="com.android.systemui.test.keyguard.quickaffordance.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.android.keyguard.clock.ClockOptionsProvider"

            android:authorities="com.android.systemui.test.keyguard.clock.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.android.systemui.people.PeopleProvider"

            android:authorities="com.android.systemui.test.people.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="androidx.core.content.FileProvider"

            android:authorities="com.android.systemui.test.fileprovider.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove"/>

    </application>



</manifest>

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

+37 −1
Original line number Diff line number Diff line
@@ -15,10 +15,46 @@ 
-->



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

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

    package="com.android.systemui.compose.features.tests" >



    <application>

    <application

        android:name="android.app.Application"

        android:appComponentFactory="androidx.core.app.AppComponentFactory"

        tools:replace="android:name,android:appComponentFactory">

        <uses-library android:name="android.test.runner" />



        <!-- Disable providers from SystemUI -->

        <provider android:name="com.android.systemui.keyguard.KeyguardSliceProvider"

            android:authorities="com.android.systemui.test.keyguard.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.google.android.systemui.keyguard.KeyguardSliceProviderGoogle"

            android:authorities="com.android.systemui.test.keyguard.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.android.systemui.keyguard.KeyguardQuickAffordanceProvider"

            android:authorities="com.android.systemui.test.keyguard.quickaffordance.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.android.keyguard.clock.ClockOptionsProvider"

            android:authorities="com.android.systemui.test.keyguard.clock.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="com.android.systemui.people.PeopleProvider"

            android:authorities="com.android.systemui.test.people.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove" />

        <provider android:name="androidx.core.content.FileProvider"

            android:authorities="com.android.systemui.test.fileprovider.disabled"

            android:enabled="false"

            tools:replace="android:authorities"

            tools:node="remove"/>

    </application>



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