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

Commit ce87a686 authored by Tiger Huang's avatar Tiger Huang
Browse files

Remove parent window from display content 

This CL removes the logic related to the legacy ActivityView.

Bug: 179161778
Bug: 161810301
Test: build and boot to home.
Change-Id: I757769d3cac89ebddbdc467f533fed99c74941ee
parent c1512c20

core/java/android/view/AccessibilityEmbeddedConnection.java

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ final class AccessibilityEmbeddedConnection extends IAccessibilityEmbeddedConnec 
                    viewRootImpl.mContext);

            viewRootImpl.mAttachInfo.mLeashedParentToken = null;

            viewRootImpl.mAttachInfo.mLeashedParentAccessibilityViewId = View.NO_ID;

            viewRootImpl.mAttachInfo.mLocationInParentDisplay.set(0, 0);

            if (accessibilityManager.isEnabled()) {

                accessibilityManager.disassociateEmbeddedHierarchy(viewRootImpl.mLeashToken);

            }

core/java/android/view/AccessibilityInteractionController.java

+0 −16
Original line number Diff line number Diff line
@@ -878,21 +878,6 @@ public final class AccessibilityInteractionController { 
        return false;

    }



    private void adjustBoundsInScreenIfNeeded(AccessibilityNodeInfo info) {

        if (info == null || shouldBypassAdjustBoundsInScreen()) {

            return;

        }

        final Rect boundsInScreen = mTempRect;

        info.getBoundsInScreen(boundsInScreen);

        boundsInScreen.offset(mViewRootImpl.mAttachInfo.mLocationInParentDisplay.x,

                mViewRootImpl.mAttachInfo.mLocationInParentDisplay.y);

        info.setBoundsInScreen(boundsInScreen);

    }



    private boolean shouldBypassAdjustBoundsInScreen() {

        return mViewRootImpl.mAttachInfo.mLocationInParentDisplay.equals(0, 0);

    }



    private void applyScreenMatrixIfNeeded(List<AccessibilityNodeInfo> infos) {

        if (infos == null || shouldBypassApplyScreenMatrix()) {

            return;
@@ -1009,7 +994,6 @@ public final class AccessibilityInteractionController { 
                                       Region interactiveRegion) {

        associateLeashedParentIfNeeded(info);

        applyScreenMatrixIfNeeded(info);

        adjustBoundsInScreenIfNeeded(info);

        // To avoid applyAppScaleAndMagnificationSpecIfNeeded changing the bounds of node,

        // then impact the visibility result, we need to adjust visibility before apply scale.

        adjustIsVisibleToUserIfNeeded(info, interactiveRegion);

core/java/android/view/IWindow.aidl

+0 −6
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ oneway interface IWindow { 
            in MergedConfiguration newMergedConfiguration,

            boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId);



    /**

     * Called when the window location in parent display has changed. The offset will only be a

     * nonzero value if the window is on an embedded display that is re-parented to another window.

     */

    void locationInParentDisplayChanged(in Point offset);



    /**

     * Called when the window insets configuration has changed.

     *

core/java/android/view/IWindowManager.aidl

+0 −10
Original line number Diff line number Diff line
@@ -547,16 +547,6 @@ interface IWindowManager 
     */

    boolean isWindowTraceEnabled();



    /**

     * Notify WindowManager that it should not override the info in DisplayManager for the specified

     * display. This can disable letter- or pillar-boxing applied in DisplayManager when the metrics

     * of the logical display reported from WindowManager do not correspond to the metrics of the

     * physical display it is based on.

     *

     * @param displayId The id of the display.

     */

    void dontOverrideDisplayInfo(int displayId);



    /**

     * Gets the windowing mode of the display.

     *

core/java/android/view/IWindowSession.aidl

+0 −11
Original line number Diff line number Diff line
@@ -272,17 +272,6 @@ interface IWindowSession { 


    oneway void updatePointerIcon(IWindow window);



    /**

     * Update the location of a child display in its parent window. This enables windows in the

     * child display to compute the global transformation matrix.

     *

     * @param window The parent window of the display.

     * @param x The x coordinate in the parent window.

     * @param y The y coordinate in the parent window.

     * @param displayId The id of the display to be notified.

     */

    oneway void updateDisplayContentLocation(IWindow window, int x, int y, int displayId);



    /**

     * Update a tap exclude region identified by provided id in the window. Touches on this region

     * will neither be dispatched to this window nor change the focus to this window. Passing an