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

Commit 2ed25e35 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "androidx_drop-stage-aosp-master" into stage-aosp-master 

* changes:
  Temporarily disable Launcher3 tests affected by fling changes
  Disable eager initialization of Jetpack libraries
parents 6772e75a 183bca2d

AndroidManifest-common.xml

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
-->

<manifest

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

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

    package="com.android.launcher3">



    <!--
@@ -176,5 +177,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->

        <provider

            android:name="androidx.startup.InitializationProvider"

            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />

    </application>

</manifest>

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.quickstep.views.RecentsView; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -218,6 +219,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    }



    @Test

    @Ignore("b/197802324")

    @PortraitLandscape

    public void testAllAppsFromHome() throws Exception {

        // Test opening all apps

tests/AndroidManifest-common.xml

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<manifest

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

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

    package="com.android.launcher3.tests">



    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
@@ -235,5 +236,11 @@ 
                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity-alias>



        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->

        <provider

            android:name="androidx.startup.InitializationProvider"

            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />

    </application>

</manifest>

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore("b/197802324")

    @PortraitLandscape

    public void testWidgets() throws Exception {

        // Test opening widgets.