Merge "Ensure we leave space between layers in docked stack." into nyc-dev

    }

    private void adjustSpecialWindows() {

        int layer = mHighestApplicationLayer + 1;

        int layer = mHighestApplicationLayer + WINDOW_LAYER_MULTIPLIER;

        // For pinned and docked stack window, we want to make them above other windows also when

        // these windows are animating.

        while (!mDockedWindows.isEmpty()) {

            layer = assignAndIncreaseLayerIfNeeded(mDockedWindows.remove(), layer);

        }

        // Leave some space here so the dim layer while dismissing docked/fullscreen stack has space

        // below the divider but above the app windows. It needs to be below the divider in because

        // the divider sometimes overlaps the app windows.

        layer++;

        layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer);

        // If we have a dock divider ensure the Input Method is above it.

    private int assignAndIncreaseLayerIfNeeded(WindowState win, int layer) {

        if (win != null) {

            assignAnimLayer(win, layer);

            layer++;

            // Make sure we leave space inbetween normal windows for dims and such.

            layer += WINDOW_LAYER_MULTIPLIER;

        }

        return layer;

    }