Merge "Magnify language selector dialog" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-11 23:04:48 +00:00
committed by Android (Google) Code Review

View File

@@ -250,8 +250,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
// 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. We use a subclass of
// WindowContainer which is omitted from screen magnification, as the IME is never magnified.
private final NonMagnifiableWindowContainers mImeWindowsContainers =
new NonMagnifiableWindowContainers("mImeWindowsContainers", mWmService);
private final NonAppWindowContainers mImeWindowsContainers =
new NonAppWindowContainers("mImeWindowsContainers", mWmService);
private WindowState mTmpWindow;
private WindowState mTmpWindow2;
@@ -4642,16 +4642,6 @@ 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) {
return mWmService.makeSurfaceBuilder(s)
.setParent(mWindowingLayer);