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

Commit 55d0f498 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille Committed by Android (Google) Code Review
Browse files

Merge "Always goes through InputFlags for Desktop Experience input flags" into main

parents dab23b0e 00a6d5e1

libs/input/InputFlags.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace { 
// Returns the cached dev option value if available.

// This check is only required for connected-displays related features.

std::optional<bool> getConnectedDisplaysDevOptionValue() {

    if (!com::android::window::flags::enable_desktop_mode_through_dev_option()) {

    if (!com::android::window::flags::show_desktop_experience_dev_option()) {

        return std::nullopt;

    }

    static std::optional<bool> cachedDevOption;

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5223,7 +5223,7 @@ ui::Transform InputDispatcher::DispatcherWindowInfo::getRawTransform( 
        std::optional<ui::LogicalDisplayId> pointerDisplayId) const {

    // TODO(b/383092013): Handle TOPOLOGY_AWARE window flag.

    // For now, we assume all windows are topology-aware and can handle cross-display streams.

    if (com::android::input::flags::connected_displays_cursor() && pointerDisplayId.has_value() &&

    if (InputFlags::connectedDisplaysCursorEnabled() && pointerDisplayId.has_value() &&

        *pointerDisplayId != windowInfo.displayId) {

        // Sending pointer to a different display than the window. This is a

        // cross-display drag gesture, so always use the new display's transform.