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

Commit 83b1cb7f authored by Ang Li's avatar Ang Li Committed by Android (Google) Code Review
Browse files

Merge "Convert keyboard ISO test to bivalent test." into main

parents d908e5f2 425f2b2f
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -7,12 +7,27 @@ package {
    default_applicable_licenses: ["frameworks_base_license"],
}

filegroup {
    name: "InputScreenshotTestRNGFiles",
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
    ],
    exclude_srcs: [
        "src/android/input/screenshot/KeyboardLayoutPreviewAnsiScreenshotTest.kt",
        "src/android/input/screenshot/KeyboardLayoutPreviewJisScreenshotTest.kt",
    ],
}

android_test {
    name: "InputScreenshotTests",
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
    ],
    exclude_srcs: [
        "src/android/input/screenshot/package-info.java",
    ],
    platform_apis: true,
    certificate: "platform",
    static_libs: [
@@ -43,6 +58,7 @@ android_test {
        "hamcrest-library",
        "kotlin-test",
        "flag-junit",
        "platform-parametric-runner-lib",
        "platform-test-annotations",
        "services.core.unboosted",
        "testables",
+71 −0
Original line number Diff line number Diff line
package {
    default_applicable_licenses: ["Android-Apache-2.0"],
}

android_library {
    name: "InputRoboRNGTestsAssetsLib",
    asset_dirs: ["assets"],
    sdk_version: "current",
    platform_apis: true,
    manifest: "AndroidManifest.xml",
    optimize: {
        enabled: false,
    },
    use_resource_processor: true,
}

android_app {
    name: "InputRoboApp",
    srcs: [],
    static_libs: [
        "androidx.test.espresso.core",
        "androidx.appcompat_appcompat",
        "flag-junit",
        "guava",
        "InputRoboRNGTestsAssetsLib",
        "platform-screenshot-diff-core",
        "PlatformComposeSceneTransitionLayoutTestsUtils",
    ],
    manifest: "robo-manifest.xml",
    aaptflags: [
        "--extra-packages",
        "com.android.input.screenshot",
    ],
    dont_merge_manifests: true,
    platform_apis: true,
    system_ext_specific: true,
    certificate: "platform",
    privileged: true,
    resource_dirs: [],
    kotlincflags: ["-Xjvm-default=all"],

    plugins: ["dagger2-compiler"],
    use_resource_processor: true,
}

android_robolectric_test {
    name: "InputRoboRNGTests",
    srcs: [
        ":InputScreenshotTestRNGFiles",
        ":flag-junit",
        ":platform-test-screenshot-rules",
    ],
    // Do not add any new libraries here, they should be added to SystemUIGoogleRobo above.
    static_libs: [
        "androidx.compose.runtime_runtime",
        "androidx.test.uiautomator_uiautomator",
        "androidx.test.ext.junit",
        "inline-mockito-robolectric-prebuilt",
        "platform-parametric-runner-lib",
        "uiautomator-helpers",
    ],
    libs: [
        "android.test.runner",
        "android.test.base",
        "android.test.mock",
        "truth",
    ],
    upstream: true,
    java_resource_dirs: ["config"],
    instrumentation_for: "InputRoboApp",
}
+21 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2023 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.android.input.screenshot">
    <uses-sdk android:minSdkVersion="21"/>
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
</manifest>
+68.5 KiB
Loading image diff...
+65.3 KiB
Loading image diff...
Loading