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

Commit 3c827555 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Ensure the IME container is never magnified."

parents 4735b97d 9034d961
Loading
Loading
Loading
Loading
+14 −3
Original line number Original line Diff line number Diff line
@@ -187,9 +187,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
            new NonAppWindowContainers("mBelowAppWindowsContainers", mService);
            new NonAppWindowContainers("mBelowAppWindowsContainers", mService);
    // Contains all IME window containers. Note that the z-ordering of the IME windows will depend
    // Contains all IME window containers. Note that the z-ordering of the IME windows will depend
    // on the IME target. We mainly have this container grouping so we can keep track of all the IME
    // on the IME target. We mainly have this container grouping so we can keep track of all the IME
    // window containers together and move them in-sync if/when needed.
    // window containers together and move them in-sync if/when needed. We use a subclass of
    private final NonAppWindowContainers mImeWindowsContainers =
    // WindowContainer which is omitted from screen magnification, as the IME is never magnified.
            new NonAppWindowContainers("mImeWindowsContainers", mService);
    private final NonMagnifiableWindowContainers mImeWindowsContainers =
            new NonMagnifiableWindowContainers("mImeWindowsContainers", mService);


    private WindowState mTmpWindow;
    private WindowState mTmpWindow;
    private WindowState mTmpWindow2;
    private WindowState mTmpWindow2;
@@ -3651,6 +3652,16 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
        }
        }
    }
    }


    private class NonMagnifiableWindowContainers extends NonAppWindowContainers {
        NonMagnifiableWindowContainers(String name, WindowManagerService service) {
            super(name, service);
        }

        @Override
        void applyMagnificationSpec(Transaction t, MagnificationSpec spec) {
        }
    };

    SurfaceControl.Builder makeSurface(SurfaceSession s) {
    SurfaceControl.Builder makeSurface(SurfaceSession s) {
        return mService.makeSurfaceBuilder(s)
        return mService.makeSurfaceBuilder(s)
                .setParent(mWindowingLayer);
                .setParent(mWindowingLayer);