Merge "Add compat fake focus to activity proto for CTS." into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
0757bded00
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user