Merge "Revert "ENABLE_TOUCH_OPAQUE_ACTIVITIES to default enabled""

This commit is contained in:
Mason Wang
2022-01-20 08:55:12 +00:00
committed by Android (Google) Code Review

View File

@@ -22,7 +22,7 @@ import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.Overridable;
import android.compat.annotation.Disabled;
import android.os.IBinder;
import android.os.InputConstants;
import android.os.Looper;
@@ -47,7 +47,7 @@ class ActivityRecordInputSink {
* Feature flag for making Activities consume all touches within their task bounds.
*/
@ChangeId
@Overridable
@Disabled
static final long ENABLE_TOUCH_OPAQUE_ACTIVITIES = 194480991L;
private static final String TAG = "ActivityRecordInputSink";
@@ -116,7 +116,8 @@ class ActivityRecordInputSink {
private InputWindowHandle createInputWindowHandle() {
InputWindowHandle inputWindowHandle = new InputWindowHandle(null,
mActivityRecord.getDisplayId());
inputWindowHandle.replaceTouchableRegionWithCrop(mActivityRecord.getSurfaceControl());
inputWindowHandle.replaceTouchableRegionWithCrop(
mActivityRecord.getParentSurfaceControl());
inputWindowHandle.name = mName;
inputWindowHandle.ownerUid = Process.myUid();
inputWindowHandle.ownerPid = Process.myPid();