| Chunk |
|---|
| Conflicting content |
|---|
if (shouldAdvanceFocusOnEnter()) {
return 0;
}
<<<<<<< HEAD
=======
break;
// Has to be done on key down (and not on key up) to correctly be intercepted.
case KeyEvent.KEYCODE_BACK:
if (mIsInTextSelectionMode) {
stopTextSelectionMode();
return -1;
}
break;
>>>>>>> aeaf2830f5ab81e6f95062514239081af65a914f
}
if (mInput != null) { |
| Solution content |
|---|
if (shouldAdvanceFocusOnEnter()) {
return 0;
}
}
if (mInput != null) { |
| File |
|---|
| TextView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Break statement |
| Case statement |
| Comment |
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
// Selection context mode
private static final int ID_SELECT_ALL = android.R.id.selectAll;
<<<<<<< HEAD
=======
private static final int ID_START_SELECTING_TEXT = android.R.id.startSelectingText;
>>>>>>> aeaf2830f5ab81e6f95062514239081af65a914f
private static final int ID_CUT = android.R.id.cut;
private static final int ID_COPY = android.R.id.copy;
private static final int ID_PASTE = android.R.id.paste; |
| Solution content |
|---|
// Selection context mode
private static final int ID_SELECT_ALL = android.R.id.selectAll;
private static final int ID_CUT = android.R.id.cut;
private static final int ID_COPY = android.R.id.copy;
private static final int ID_PASTE = android.R.id.paste; |
| File |
|---|
| TextView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
.getSystemService(Context.CLIPBOARD_SERVICE);
switch (id) {
<<<<<<< HEAD
=======
case ID_SELECT_ALL:
Selection.setSelection((Spannable) mText, 0, mText.length());
startTextSelectionMode();
return true;
case ID_START_SELECTING_TEXT:
startTextSelectionMode();
return true;
case ID_CUT:
clip.setText(mTransformed.subSequence(min, max));
((Editable) mText).delete(min, max);
stopTextSelectionMode();
return true;
case ID_COPY:
clip.setText(mTransformed.subSequence(min, max));
stopTextSelectionMode();
return true;
case ID_PASTE:
CharSequence paste = clip.getText();
if (paste != null) {
Selection.setSelection((Spannable) mText, max);
((Editable) mText).replace(min, max, paste);
stopTextSelectionMode();
}
return true;
>>>>>>> aeaf2830f5ab81e6f95062514239081af65a914f
case ID_COPY_URL:
MetaKeyKeyListener.stopSelecting(this, (Spannable) mText);
|
| Solution content |
|---|
.getSystemService(Context.CLIPBOARD_SERVICE);
switch (id) {
case ID_COPY_URL:
MetaKeyKeyListener.stopSelecting(this, (Spannable) mText);
|
| File |
|---|
| TextView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Case statement |
| If statement |
| Method invocation |
| Return statement |
| Variable |