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

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

Merge "Add camera compat state to activity proto for CTS." into udc-dev am: 971b78dc 

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



Change-Id: I8f4892d059d6b770cd0eb17711b7137efe13dfd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20fd41ac 971b78dc

core/proto/android/server/windowmanagerservice.proto

+3 −0
Original line number Diff line number Diff line
@@ -391,6 +391,9 @@ message ActivityRecordProto { 
    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;

    optional bool should_force_rotate_for_camera_compat = 39;

    optional bool should_refresh_activity_for_camera_compat = 40;

    optional bool should_refresh_activity_via_pause_for_camera_compat = 41;

}



/* represents WindowToken */

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

+9 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ 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_FORCE_ROTATE_FOR_CAMERA_COMPAT;

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

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

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;
@@ -10228,6 +10231,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        proto.write(LAST_DROP_INPUT_MODE, mLastDropInputMode);

        proto.write(OVERRIDE_ORIENTATION, getOverrideOrientation());

        proto.write(SHOULD_SEND_COMPAT_FAKE_FOCUS, shouldSendCompatFakeFocus());

        proto.write(SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT,

                mLetterboxUiController.shouldForceRotateForCameraCompat());

        proto.write(SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT,

                mLetterboxUiController.shouldRefreshActivityForCameraCompat());

        proto.write(SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT,

                mLetterboxUiController.shouldRefreshActivityViaPauseForCameraCompat());

    }



    @Override