OSDN Git Service

Merge "Input: Override touchable region bounds with surface bounds 2/2"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sun, 17 Mar 2019 22:46:08 +0000 (22:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 17 Mar 2019 22:46:08 +0000 (22:46 +0000)
1  2 
services/surfaceflinger/Layer.cpp
services/surfaceflinger/Layer.h

Simple merge
@@@ -184,10 -181,8 +184,11 @@@ public
  
          bool inputInfoChanged;
          InputWindowInfo inputInfo;
+         wp<Layer> touchableRegionCrop;
  
 +        // dataspace is only used by BufferStateLayer and ColorLayer
 +        ui::Dataspace dataspace;
 +
          // The fields below this point are only used by BufferStateLayer
          Geometry active;