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

Commit 59dca6a3 authored by Stefan Andonian's avatar Stefan Andonian
Browse files

Fix test AndroidManifest configuration in udc-dev SysUi Studio.

Bug: 270158224
Test: tests now compile.
Change-Id: I78cd0f87b01a253c7f4d1713f633310ef028123b
parent 53a5086e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 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"
    }
+2 −7
Original line number Diff line number Diff line
@@ -15,23 +15,18 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.app.motiontool">
    package="com.android.app.motiontool.tests">

    <application
        android:debuggable="true"
        android:theme="@android:style/Theme.NoTitleBar">

        <activity
            android:name=".util.TestActivity"
            android:name="com.android.app.motiontool.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>
+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 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"
    }
+2 −8
Original line number Diff line number Diff line
@@ -15,23 +15,17 @@
  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.app.viewcapture">

    package="com.android.app.viewcapture.test">
    <application
        android:debuggable="true"
        android:theme="@android:style/Theme.NoTitleBar">

        <activity
            android:name=".TestActivity"
            android:name="com.android.app.viewcapture.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>
+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package com.android.app.viewcapture

import android.Manifest
import android.content.Context
import android.content.Intent
import android.media.permission.SafeCloseable
@@ -26,6 +27,7 @@ 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
@@ -40,6 +42,8 @@ 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() {