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

Commit 22173a0e authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Adding Dim Bounds to Proto" into main

parents 83691cc8 841d528b

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ message WindowStateProto { 
    repeated .android.graphics.RectProto unrestricted_keep_clear_areas = 46;

    repeated .android.view.InsetsSourceProto mergedLocalInsetsSources = 47;

    optional int32 requested_visible_types = 48;

    optional .android.graphics.RectProto dim_bounds = 49;

}



message IdentifierProto {

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

+7 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ import static com.android.server.wm.WindowStateProto.ANIMATING_EXIT; 
import static com.android.server.wm.WindowStateProto.ANIMATOR;

import static com.android.server.wm.WindowStateProto.ATTRIBUTES;

import static com.android.server.wm.WindowStateProto.DESTROYING;

import static com.android.server.wm.WindowStateProto.DIM_BOUNDS;

import static com.android.server.wm.WindowStateProto.DISPLAY_ID;

import static com.android.server.wm.WindowStateProto.FORCE_SEAMLESS_ROTATION;

import static com.android.server.wm.WindowStateProto.GIVEN_CONTENT_INSETS;
@@ -4118,6 +4119,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                mMergedLocalInsetsSources.valueAt(i).dumpDebug(proto, MERGED_LOCAL_INSETS_SOURCES);

            }

        }

        if (getDimController() != null) {

            final Rect dimBounds = getDimController().getDimBounds();

            if (dimBounds != null) {

                dimBounds.dumpDebug(proto, DIM_BOUNDS);

            }

        }

        proto.end(token);

    }