diff options
| author | Jusik Chung <jschung@google.com> | 2024-01-09 01:53:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-09 01:53:32 +0000 |
| commit | c2cd403913f69972b711d8d774df72a325b17801 (patch) | |
| tree | af501b07cdd6025720c620d3032883a1b7dee85a | |
| parent | e45570cebe9933b75a7a4bd631aaa007125090f3 (diff) | |
| parent | f505f53decd13f6202d52415fb8fb6c012f3ca36 (diff) | |
| download | aemu-c2cd403913f69972b711d8d774df72a325b17801.tar.gz | |
Merge "Apply stacked layout for automotive devices" into main
| -rw-r--r-- | base/include/aemu/base/LayoutResolver.h | 4 | ||||
| -rw-r--r-- | host-common/include/host-common/MultiDisplay.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/base/include/aemu/base/LayoutResolver.h b/base/include/aemu/base/LayoutResolver.h index 1e30d3c..00940bb 100644 --- a/base/include/aemu/base/LayoutResolver.h +++ b/base/include/aemu/base/LayoutResolver.h @@ -28,5 +28,9 @@ std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> resolveLayout( std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> rect, const double monitorAspectRatio); +std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> resolveStackedLayout( + std::unordered_map<uint32_t, std::pair<uint32_t, uint32_t>> rectangles, + const uint32_t monitorWidth); + } // namespace base } // namespace android diff --git a/host-common/include/host-common/MultiDisplay.h b/host-common/include/host-common/MultiDisplay.h index 909d840..879ecf2 100644 --- a/host-common/include/host-common/MultiDisplay.h +++ b/host-common/include/host-common/MultiDisplay.h @@ -126,6 +126,7 @@ public: void performRotation(int rot); bool notifyDisplayChanges(); + bool isOrientationSupported(); // 0 for default Android display // 1-5 for Emulator UI @@ -145,6 +146,7 @@ private: void performRotationLocked(int rot); void recomputeLayoutLocked(); + void recomputeStackedLayoutLocked(); void getCombinedDisplaySizeLocked(uint32_t* w, uint32_t* h); bool getMultiDisplay(uint32_t id, int32_t* x, |