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

Commit b5c6cc39 authored by Patrick Williams's avatar Patrick Williams
Browse files

Use display transform in WindowInfosListenerForTest 

This fixes some test issues when physical and logical display sizes differ.

Bug: 294251187
Bug: 296424695
Test: SurfaceControlViewHostTests after running `adb shell wm size 800x1920`
Change-Id: Id9553b7d965ecaa6adf9c5c7acffe2f57576c716
Merged-In: Id9553b7d965ecaa6adf9c5c7acffe2f57576c716
(cherry picked from commit f103479f)
parent 3cfa79c5

core/java/android/window/WindowInfosListenerForTest.java

+22 −3
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ import android.annotation.NonNull; 
import android.annotation.RequiresPermission;

import android.annotation.TestApi;

import android.graphics.Rect;

import android.graphics.RectF;

import android.os.IBinder;

import android.os.InputConfig;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Pair;

import android.util.SparseArray;

import android.view.InputWindowHandle;



import java.util.ArrayList;
@@ -119,13 +121,13 @@ public class WindowInfosListenerForTest { 
                            "Exception thrown while waiting for listener to be called with "

                                    + "initial state");

                }

                consumer.accept(buildWindowInfos(windowHandles));

                consumer.accept(buildWindowInfos(windowHandles, displayInfos));

            }

        };

        mListeners.put(consumer, listener);

        Pair<InputWindowHandle[], WindowInfosListener.DisplayInfo[]> initialState =

                listener.register();

        consumer.accept(buildWindowInfos(initialState.first));

        consumer.accept(buildWindowInfos(initialState.first, initialState.second));

        calledWithInitialState.countDown();

    }
@@ -140,11 +142,28 @@ public class WindowInfosListenerForTest { 
        listener.unregister();

    }



    private static List<WindowInfo> buildWindowInfos(InputWindowHandle[] windowHandles) {

    private static List<WindowInfo> buildWindowInfos(

            InputWindowHandle[] windowHandles, WindowInfosListener.DisplayInfo[] displayInfos) {

        var windowInfos = new ArrayList<WindowInfo>(windowHandles.length);



        var displayInfoById = new SparseArray<WindowInfosListener.DisplayInfo>(displayInfos.length);

        for (var displayInfo : displayInfos) {

            displayInfoById.put(displayInfo.mDisplayId, displayInfo);

        }



        var tmp = new RectF();

        for (var handle : windowHandles) {

            var bounds = new Rect(handle.frameLeft, handle.frameTop, handle.frameRight,

                    handle.frameBottom);



            // Transform bounds from physical display coordinates to logical display coordinates.

            var display = displayInfoById.get(handle.displayId);

            if (display != null) {

                tmp.set(bounds);

                display.mTransform.mapRect(tmp);

                tmp.round(bounds);

            }



            windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, handle.displayId,

                    bounds, handle.inputConfig));

        }