Projects >> frameworks_base_disabled >>371790b77491c1ea6a4abeb334143fa3a58e0652

Chunk
Conflicting content 
     * @param text The auto complete text the user has selected.
     */
    public void onCommitCompletion(CompletionInfo text) {
<<<<<<< HEAD
        // intentionally empty
=======
        // Intentionally empty
>>>>>>> 955e8d79b1e75acd3e7963cb13afce134a193af3
    }

    /**
Solution content 
     * @param text The auto complete text the user has selected.
     */
    public void onCommitCompletion(CompletionInfo text) {
        // intentionally empty
    }

    /**
File
TextView.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        private int mContainerPositionX, mContainerPositionY;
        // Visible or not (scrolled off screen), whether or not this handle should be visible
        private boolean mIsActive = false;
<<<<<<< HEAD

        public HandleView() {
            super(TextView.this.mContext);
            mContainer = new PopupWindow(TextView.this.mContext, null,
                    com.android.internal.R.attr.textSelectHandleWindowStyle);
            mContainer.setSplitTouchEnabled(true);
            mContainer.setClippingEnabled(false);
            mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
            mContainer.setContentView(this);

            initDrawable();

            final int handleHeight = mDrawable.getIntrinsicHeight();
            mTouchOffsetY = -0.3f * handleHeight;
            mIdealVerticalOffset = 0.7f * handleHeight;
        }

        protected abstract void initDrawable();
=======
        // The insertion handle can have an associated PastePopupMenu
        private boolean mIsInsertionHandle = false;
        private PastePopupMenu mPastePopupWindow;
>>>>>>> 955e8d79b1e75acd3e7963cb13afce134a193af3

        // Touch-up filter: number of previous positions remembered
        private static final int HISTORY_SIZE = 5;
Solution content 
        private int mContainerPositionX, mContainerPositionY;
        // Visible or not (scrolled off screen), whether or not this handle should be visible
        private boolean mIsActive = false;

        public HandleView() {
            super(TextView.this.mContext);
            mContainer = new PopupWindow(TextView.this.mContext, null,
                    com.android.internal.R.attr.textSelectHandleWindowStyle);
            mContainer.setSplitTouchEnabled(true);
            mContainer.setClippingEnabled(false);
            mContainer.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
            mContainer.setContentView(this);

            initDrawable();

            final int handleHeight = mDrawable.getIntrinsicHeight();
            mTouchOffsetY = -0.3f * handleHeight;
            mIdealVerticalOffset = 0.7f * handleHeight;
        }

        protected abstract void initDrawable();

        // Touch-up filter: number of previous positions remembered
        private static final int HISTORY_SIZE = 5;
File
TextView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method declaration
Method interface
Chunk
Conflicting content 
                }

                case MotionEvent.ACTION_UP:
<<<<<<< HEAD
=======
                    if (mIsInsertionHandle) {
                        final float deltaX = mDownPositionX - ev.getRawX();
                        final float deltaY = mDownPositionY - ev.getRawY();
                        final float distanceSquared = deltaX * deltaX + deltaY * deltaY;
                        if (distanceSquared < mSquaredTouchSlopDistance) {
                            if (mPastePopupWindow != null && mPastePopupWindow.isShowing()) {
                                // Tapping on the handle dismisses the displayed paste view,
                                mPastePopupWindow.hide();
                            } else {
                                ((InsertionPointCursorController) mController).show(0);
                            }
                        }
                    }
>>>>>>> 955e8d79b1e75acd3e7963cb13afce134a193af3
                    filterOnTouchUp();
                    mIsDragging = false;
                    break;
Solution content 
                }

                case MotionEvent.ACTION_UP:
                    filterOnTouchUp();
                    mIsDragging = false;
                    break;
File
TextView.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
        @Override
        public void onDetached() {
<<<<<<< HEAD
            final ViewTreeObserver observer = getViewTreeObserver();
            observer.removeOnTouchModeChangeListener(this);

            if (mStartHandle != null) mStartHandle.onDetached();
            if (mEndHandle != null) mEndHandle.onDetached();
=======
            // Nothing to do
>>>>>>> 955e8d79b1e75acd3e7963cb13afce134a193af3
        }
    }
Solution content 
        @Override
        public void onDetached() {
            final ViewTreeObserver observer = getViewTreeObserver();
            observer.removeOnTouchModeChangeListener(this);

            if (mStartHandle != null) mStartHandle.onDetached();
            if (mEndHandle != null) mEndHandle.onDetached();
        }
    }
File
TextView.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable