Merge "DisplayTopologyGraph offset in dp and store densities" into main

Author: Piotr Wilczyński

include/input/DisplayTopologyGraph.h

@@ -43,7 +43,7 @@ enum class DisplayTopologyPosition : int32_t {
 struct DisplayTopologyAdjacentDisplay {
     ui::LogicalDisplayId displayId = ui::LogicalDisplayId::INVALID;
     DisplayTopologyPosition position;
-    float offsetPx;
+    float offsetDp;
 };
 
 /**
@@ -52,6 +52,7 @@ struct DisplayTopologyAdjacentDisplay {
 struct DisplayTopologyGraph {
     ui::LogicalDisplayId primaryDisplayId = ui::LogicalDisplayId::INVALID;
     std::unordered_map<ui::LogicalDisplayId, std::vector<DisplayTopologyAdjacentDisplay>> graph;
+    std::unordered_map<ui::LogicalDisplayId, int> displaysDensity;
 };
 
 } // namespace android

services/inputflinger/PointerChoreographer.cpp

@@ -1017,9 +1017,9 @@ PointerChoreographer::findDestinationDisplayLocked(const ui::LogicalDisplayId so
                         sourceBoundary == DisplayTopologyPosition::BOTTOM
                 ? (destinationViewport->logicalRight - destinationViewport->logicalLeft)
                 : (destinationViewport->logicalBottom - destinationViewport->logicalTop);
-        if (cursorOffset >= adjacentDisplay.offsetPx &&
-            cursorOffset <= adjacentDisplay.offsetPx + edgeSize) {
-            return std::make_pair(destinationViewport, adjacentDisplay.offsetPx);
+        if (cursorOffset >= adjacentDisplay.offsetDp &&
+            cursorOffset <= adjacentDisplay.offsetDp + edgeSize) {
+            return std::make_pair(destinationViewport, adjacentDisplay.offsetDp);
         }
     }
     return std::nullopt;