Projects >> packages_input_LatinIME >>37f948b2243741ca4230eded1d9520938548a6e3

Chunk
Conflicting content
        mController = controller;
        mListener = listener;
        final View container = (View)getParent();
<<<<<<< HEAD:java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
        final MoreKeysKeyboard pane = (MoreKeysKeyboard)getKeyboard();
=======
        final MiniKeyboard pane = (MiniKeyboard)getKeyboard();
>>>>>>> f87df70c10f497ff0497508e4e18d82372447f04:java/src/com/android/inputmethod/keyboard/MiniKeyboardView.java
        final int defaultCoordX = pane.getDefaultCoordX();
        // The coordinates of panel's left-top corner in parentView's coordinate system.
        final int x = pointX - defaultCoordX - container.getPaddingLeft()
Solution content
        mController = controller;
        mListener = listener;
        final View container = (View)getParent();
        final MoreKeysKeyboard pane = (MoreKeysKeyboard)getKeyboard();
        final int defaultCoordX = pane.getDefaultCoordX();
        // The coordinates of panel's left-top corner in parentView's coordinate system.
        final int x = pointX - defaultCoordX - container.getPaddingLeft()
File
MoreKeysKeyboardView.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Variable