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

Commit 47653ee9 authored by Chris Li's avatar Chris Li Committed by Gerrit Code Review
Browse files

Merge "Expose state of ignoring orientation"

parents ff525f47 dd8d8be3

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ message DisplayAreaProto { 
    optional bool is_root_display_area = 5;

    optional int32 feature_id = 6;

    optional bool is_organized = 7;

    optional bool is_ignoring_orientation_request = 8;

}



/* represents a generic child of a DisplayArea */

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

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.window.DisplayAreaOrganizer.FEATURE_WINDOW_TOKENS; 
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION;

import static com.android.internal.util.Preconditions.checkState;

import static com.android.server.wm.DisplayAreaProto.FEATURE_ID;

import static com.android.server.wm.DisplayAreaProto.IS_IGNORING_ORIENTATION_REQUEST;

import static com.android.server.wm.DisplayAreaProto.IS_ORGANIZED;

import static com.android.server.wm.DisplayAreaProto.IS_ROOT_DISPLAY_AREA;

import static com.android.server.wm.DisplayAreaProto.IS_TASK_DISPLAY_AREA;
@@ -291,6 +292,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 
        proto.write(IS_ROOT_DISPLAY_AREA, asRootDisplayArea() != null);

        proto.write(FEATURE_ID, mFeatureId);

        proto.write(IS_ORGANIZED, isOrganized());

        proto.write(IS_IGNORING_ORIENTATION_REQUEST, getIgnoreOrientationRequest());

        proto.end(token);

    }