| Chunk |
|---|
| Conflicting content |
|---|
import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; <<<<<<< HEAD ======= import android.content.SharedPreferences; import android.graphics.BitmapFactory; import android.graphics.Color; >>>>>>> d29570f185d585d3eaf83ebf8b9e78928f36ad2e import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; |
| Solution content |
|---|
import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.SharedPreferences; import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; |
| File |
|---|
| LibraryActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public boolean onCreateOptionsMenu(Menu menu) {
<<<<<<< HEAD
MenuItem item2 = menu.add("Show bookcase");
item2.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent(LibraryActivity.this, BookCaseActivity.class);
startActivity(intent);
=======
MenuItem prefs = menu.add(R.string.prefs);
prefs.setIcon( getResources().getDrawable(R.drawable.cog) );
prefs.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent(LibraryActivity.this, PageTurnerPrefsActivity.class);
startActivity(intent);
>>>>>>> d29570f185d585d3eaf83ebf8b9e78928f36ad2e
return true;
}
}); |
| Solution content |
|---|
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuItem item2 = menu.add("Show bookcase");
item2.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent(LibraryActivity.this, BookCaseActivity.class);
startActivity(intent);
return true;
}
});
MenuItem prefs = menu.add(R.string.prefs);
prefs.setIcon( getResources().getDrawable(R.drawable.cog) );
prefs.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent(LibraryActivity.this, PageTurnerPrefsActivity.class);
startActivity(intent);
return true;
}
}); |
| File |
|---|
| LibraryActivity.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
});
<<<<<<< HEAD
return true;
}
@Override
public boolean onMenuItemSelected(int featureId, MenuItem item) {
Intent intent = new Intent("org.openintents.action.PICK_DIRECTORY");
=======
MenuItem item = menu.add(R.string.scan_books);
item.setIcon( getResources().getDrawable(R.drawable.book_refresh) );
item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent("org.openintents.action.PICK_DIRECTORY");
>>>>>>> d29570f185d585d3eaf83ebf8b9e78928f36ad2e
try {
startActivityForResult(intent, 1); |
| Solution content |
|---|
}
});
MenuItem item = menu.add(R.string.scan_books);
item.setIcon( getResources().getDrawable(R.drawable.book_refresh) );
item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
Intent intent = new Intent("org.openintents.action.PICK_DIRECTORY");
try {
startActivityForResult(intent, 1); |
| File |
|---|
| LibraryActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
this.waitDialog = new ProgressDialog(this);
this.waitDialog.setOwnerActivity(this);
<<<<<<< HEAD
this.gestureDetector = new GestureDetector(this, new SwipeListener());
=======
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
this.gestureDetector = new GestureDetector(new NavGestureDetector(
bookView, this, metrics));
/*
final PinchZoomListener pinch = new PinchZoomListener( this,
new PinchZoomListener.FloatAdapter() {
@Override public void setValue(float value) { updateTextSize(value); }
@Override public float getValue() { return bookView.getTextSize(); }
});
*/
>>>>>>> d29570f185d585d3eaf83ebf8b9e78928f36ad2e
this.gestureListener = new View.OnTouchListener() {
public boolean onTouch(View v, MotionEvent event) {
//pinch.onTouch(v, event); |
| Solution content |
|---|
this.waitDialog = new ProgressDialog(this);
this.waitDialog.setOwnerActivity(this);
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
this.gestureDetector = new GestureDetector(new NavGestureDetector(
bookView, this, metrics));
/*
final PinchZoomListener pinch = new PinchZoomListener( this,
new PinchZoomListener.FloatAdapter() {
@Override public void setValue(float value) { updateTextSize(value); }
@Override public float getValue() { return bookView.getTextSize(); }
});
*/
this.gestureListener = new View.OnTouchListener() {
public boolean onTouch(View v, MotionEvent event) {
//pinch.onTouch(v, event); |
| File |
|---|
| ReadingActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void run() {
<<<<<<< HEAD
if ( dummyView.getAnimator() == null ) {
LOG.debug( "BookView no longer has an animator. Aborting rolling blind." );
//stopRollingBlind();
} else {
Animator anim = dummyView.getAnimator();
if ( anim.isFinished() ) {
if ( viewSwitcher.getCurrentView() == dummyView ) {
viewSwitcher.showNext();
}
dummyView.setAnimator(null);
} else {
anim.advanceOneFrame();
dummyView.invalidate();
int delay = 1000 / anim.getAnimationSpeed();
handler.postDelayed(this, delay);
}
}
}
=======
if ( this.animator.isFinished() ) {
if ( viewSwitcher.getCurrentView() == dummyView ) {
viewSwitcher.showNext();
}
dummyView.setAnimator(null);
} else {
this.animator.advanceOneFrame();
dummyView.invalidate();
int delay = 1000 / this.animator.getAnimationSpeed();
uiHandler.postDelayed(this, delay);
}
}
>>>>>>> d29570f185d585d3eaf83ebf8b9e78928f36ad2e
}
private class AutoScrollRunnable implements Runnable { |
| Solution content |
|---|
@Override
public void run() {
if ( this.animator.isFinished() ) {
if ( viewSwitcher.getCurrentView() == dummyView ) {
viewSwitcher.showNext();
}
dummyView.setAnimator(null);
} else {
this.animator.advanceOneFrame();
dummyView.invalidate();
int delay = 1000 / this.animator.getAnimationSpeed();
uiHandler.postDelayed(this, delay);
}
}
}
private class AutoScrollRunnable implements Runnable { |
| File |
|---|
| ReadingActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |