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

Commit 0c0998d1 authored by Dan Shi's avatar Dan Shi Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix test AndroidManifest configuration in udc-dev SysUi... 

Merge "Revert "Fix test AndroidManifest configuration in udc-dev SysUi Studio."" into udc-dev am: 7fb02ebf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/22374052



Change-Id: I505b00639b219006fb07bcb17b2fc80e68c58189
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88314cb7 7fb02ebf

motiontoollib/build.gradle

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/motiontoollib 


android {

    namespace = "com.android.app.motiontool"

    testNamespace = "com.android.app.motiontool.tests"

    defaultConfig {

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

motiontoollib/tests/AndroidManifest.xml

+7 −2
Original line number Diff line number Diff line
@@ -15,18 +15,23 @@ 
-->



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

    package="com.android.app.motiontool.tests">

    package="com.android.app.motiontool">



    <application

        android:debuggable="true"

        android:theme="@android:style/Theme.NoTitleBar">



        <activity

            android:name="com.android.app.motiontool.util.TestActivity"

            android:name=".util.TestActivity"

            android:exported="false" />



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



    </application>



    <instrumentation

        android:name="android.testing.TestableInstrumentation"

        android:label="Tests for MotionTool Lib"

        android:targetPackage="com.android.app.motiontool"/>



</manifest>

viewcapturelib/build.gradle

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/viewcaptureli 


android {

    namespace = "com.android.app.viewcapture"

    testNamespace = "com.android.app.viewcapture.test"

    defaultConfig {

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

viewcapturelib/tests/AndroidManifest.xml

+8 −2
Original line number Diff line number Diff line
@@ -15,17 +15,23 @@ 
  -->



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

    package="com.android.app.viewcapture.test">

    package="com.android.app.viewcapture">



    <application

        android:debuggable="true"

        android:theme="@android:style/Theme.NoTitleBar">



        <activity

            android:name="com.android.app.viewcapture.TestActivity"

            android:name=".TestActivity"

            android:exported="false" />



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



    </application>



    <instrumentation

        android:name="android.testing.TestableInstrumentation"

        android:label="Tests for ViewCapture Lib"

        android:targetPackage="com.android.app.viewcapture" />



</manifest>

viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt

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


package com.android.app.viewcapture



import android.Manifest

import android.content.Context

import android.content.Intent

import android.media.permission.SafeCloseable
@@ -27,7 +26,6 @@ import android.view.View 
import androidx.test.ext.junit.rules.ActivityScenarioRule

import androidx.test.filters.SmallTest

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.rule.GrantPermissionRule

import com.android.app.viewcapture.SettingsAwareViewCapture.Companion.VIEW_CAPTURE_ENABLED

import com.android.app.viewcapture.ViewCapture.MAIN_EXECUTOR

import junit.framework.Assert.assertEquals
@@ -42,8 +40,6 @@ class SettingsAwareViewCaptureTest { 
    private val activityIntent = Intent(context, TestActivity::class.java)



    @get:Rule val activityScenarioRule = ActivityScenarioRule<TestActivity>(activityIntent)

    @get:Rule val grantPermissionRule =

        GrantPermissionRule.grant(Manifest.permission.WRITE_SECURE_SETTINGS)



    @Test

    fun do_not_capture_view_hierarchies_if_setting_is_disabled() {