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

Commit 030279b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add inputConfig to winscope protos" into udc-qpr-dev am: ba2f0951 

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



Change-Id: Iba573ce1e4259a6e9ce9d1187624b3f2d526e7b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8434a41 ba2f0951

services/surfaceflinger/LayerProtoHelper.cpp

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ void LayerProtoHelper::writeToProto( 


    InputWindowInfoProto* proto = getInputWindowInfoProto();

    proto->set_layout_params_flags(inputInfo.layoutParamsFlags.get());

    proto->set_input_config(inputInfo.inputConfig.get());

    using U = std::underlying_type_t<WindowInfo::Type>;

    // TODO(b/129481165): This static assert can be safely removed once conversion warnings

    // are re-enabled.

services/surfaceflinger/Tracing/TransactionProtoParser.cpp

+3 −4
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ proto::LayerState TransactionProtoParser::toProto( 
            windowInfoProto->set_layout_params_flags(inputInfo->layoutParamsFlags.get());

            windowInfoProto->set_layout_params_type(

                    static_cast<int32_t>(inputInfo->layoutParamsType));

            windowInfoProto->set_input_config(inputInfo->inputConfig.get());

            LayerProtoHelper::writeToProto(inputInfo->touchableRegion,

                                           windowInfoProto->mutable_touchable_region());

            windowInfoProto->set_surface_inset(inputInfo->surfaceInset);
@@ -467,11 +468,9 @@ void TransactionProtoParser::fromProto(const proto::LayerState& proto, 
                static_cast<gui::WindowInfo::Type>(windowInfoProto.layout_params_type());

        LayerProtoHelper::readFromProto(windowInfoProto.touchable_region(),

                                        inputInfo.touchableRegion);

        inputInfo.inputConfig =

                ftl::Flags<gui::WindowInfo::InputConfig>(windowInfoProto.input_config());

        inputInfo.surfaceInset = windowInfoProto.surface_inset();

        inputInfo.setInputConfig(gui::WindowInfo::InputConfig::NOT_FOCUSABLE,

                                 !windowInfoProto.focusable());

        inputInfo.setInputConfig(gui::WindowInfo::InputConfig::DUPLICATE_TOUCH_TO_WALLPAPER,

                                 windowInfoProto.has_wallpaper());

        inputInfo.globalScaleFactor = windowInfoProto.global_scale_factor();

        const proto::Transform& transformProto = windowInfoProto.transform();

        inputInfo.transform.set(transformProto.dsdx(), transformProto.dtdx(), transformProto.dtdy(),

services/surfaceflinger/layerproto/common.proto

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ message InputWindowInfoProto { 
    bool replace_touchable_region_with_crop = 14;

    RectProto touchable_region_crop = 15;

    TransformProto transform = 16;

    uint32 input_config = 17;

}



message BlurRegion {

services/surfaceflinger/layerproto/transactions.proto

+3 −2
Original line number Diff line number Diff line
@@ -256,13 +256,14 @@ message LayerState { 
        int32 layout_params_type = 2;

        RegionProto touchable_region = 3;

        int32 surface_inset = 4;

        bool focusable = 5;

        bool has_wallpaper = 6;

        bool focusable = 5; // unused

        bool has_wallpaper = 6; // unused

        float global_scale_factor = 7;

        uint32 crop_layer_id = 8;

        bool replace_touchable_region_with_crop = 9;

        RectProto touchable_region_crop = 10;

        Transform transform = 11;

        uint32 input_config = 12;

    }

    WindowInfo window_info_handle = 27;

    float bg_color_alpha = 28;