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

Commit 50b9a7af authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Add compat fake focus to activity proto for CTS." into udc-dev am: 0757bded 

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



Change-Id: Ib81551442b537d00dad4d59c44ae2645935ba061
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df4d309a 0757bded

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ message ActivityRecordProto { 
    optional bool enable_recents_screenshot = 35;

    optional int32 last_drop_input_mode = 36;

    optional int32 override_orientation = 37 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation"];

    optional bool should_send_compat_fake_focus = 38;

}



/* represents WindowToken */

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ import static com.android.server.wm.ActivityRecordProto.PROC_ID; 
import static com.android.server.wm.ActivityRecordProto.PROVIDES_MAX_BOUNDS;

import static com.android.server.wm.ActivityRecordProto.REPORTED_DRAWN;

import static com.android.server.wm.ActivityRecordProto.REPORTED_VISIBLE;

import static com.android.server.wm.ActivityRecordProto.SHOULD_SEND_COMPAT_FAKE_FOCUS;

import static com.android.server.wm.ActivityRecordProto.STARTING_DISPLAYED;

import static com.android.server.wm.ActivityRecordProto.STARTING_MOVED;

import static com.android.server.wm.ActivityRecordProto.STARTING_WINDOW;
@@ -10224,6 +10225,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        proto.write(ENABLE_RECENTS_SCREENSHOT, mEnableRecentsScreenshot);

        proto.write(LAST_DROP_INPUT_MODE, mLastDropInputMode);

        proto.write(OVERRIDE_ORIENTATION, getOverrideOrientation());

        proto.write(SHOULD_SEND_COMPAT_FAKE_FOCUS, shouldSendCompatFakeFocus());

    }



    @Override