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

Commit 4c46d871 authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Use display transform in WindowInfosListenerForTest" into udc-qpr-dev am: ab312208 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24502742



Change-Id: Iae00c00235be654808c3e9b34e8e4e4db77b20ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4858a8b8 ab312208

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;
@@ -127,13 +129,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();

    }
@@ -148,11 +150,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));

        }