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

Commit 3c6b6598 authored by Mady Mellor's avatar Mady Mellor
Browse files

Use the screenshot theme on wmshell screenshot tests 

* This ensures screenshots in the tests are taken with light & dark
  theme
* Additionally, set a background color on the activity in our
  user education test -- otherwise the colors in the education views
  match the background of the activity and we miss the outline of
  the arrow & rounded corners on the view

Flag: EXEMPT test change
Test: atest --request-upload-result WMShellRobolectricScreenshotTests:com.android.wm.shell.bubbles.BubbleEducationViewScreenshotTest
      & inspect the screenshots in the uploaded result (ran on acloud device)
Bug: 375030558
Change-Id: Ide7eb87b8d05fb3b8930ec21644ca5429a41c34a
parent ac9181e1

libs/WindowManager/Shell/multivalentScreenshotTests/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ android_app { 
    static_libs: [

        "WindowManager-Shell",

        "platform-screenshot-diff-core",

        "ScreenshotComposeUtilsLib", // ComposableScreenshotTestRule & Theme.PlatformUi.Screenshot

        "SystemUI-res", // Theme.SystemUI (dragged in by ScreenshotComposeUtilsLib)

    ],

    asset_dirs: ["goldens/robolectric"],

    manifest: "AndroidManifestRobolectric.xml",
@@ -63,6 +65,8 @@ android_test { 
    ],

    static_libs: [

        "WindowManager-Shell",

        "ScreenshotComposeUtilsLib", // ComposableScreenshotTestRule & Theme.PlatformUi.Screenshot

        "SystemUI-res", // Theme.SystemUI (dragged in by ScreenshotComposeUtilsLib)

        "junit",

        "androidx.test.runner",

        "androidx.test.rules",

libs/WindowManager/Shell/multivalentScreenshotTests/AndroidManifestRobolectric.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    <application android:debuggable="true" android:supportsRtl="true">

        <activity

            android:name="platform.test.screenshot.ScreenshotActivity"

            android:theme="@style/Theme.PlatformUi.Screenshot"

            android:exported="true">

        </activity>

    </application>

libs/WindowManager/Shell/multivalentScreenshotTests/src/com/android/wm/shell/bubbles/BubbleEducationViewScreenshotTest.kt

+7 −1
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ 
 */

package com.android.wm.shell.bubbles



import android.graphics.Color

import android.view.LayoutInflater

import android.view.ViewGroup

import com.android.wm.shell.R

import com.android.wm.shell.shared.bubbles.BubblePopupView

import com.android.wm.shell.testing.goldenpathmanager.WMShellGoldenPathManager

import com.android.wm.shell.R

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith
@@ -48,6 +50,10 @@ class BubbleEducationViewScreenshotTest(emulationSpec: DeviceEmulationSpec) { 
    fun bubblesEducation() {

        screenshotRule.screenshotTest("bubbles_education") { activity ->

            activity.actionBar?.hide()

            // Set the background color of the activity to be something not from the theme to

            // ensure good contrast between the education view and the background

            val rootView = activity.window.decorView.findViewById(android.R.id.content) as ViewGroup

            rootView.setBackgroundColor(Color.RED)

            val view =

                LayoutInflater.from(activity)

                    .inflate(R.layout.bubble_bar_stack_education, null) as BubblePopupView