Projects >> android-arabic-reader >>4f04bf0d39c407367dd7891d7427358ae26e3840

Chunk
Conflicting content
package org.geometerplus.android.fbreader;

<<<<<<< HEAD
import android.app.ActionBar;
=======
>>>>>>> e94e59ef5b36e101801e6c0e8648db41908cb16e
import android.app.ListActivity;
import android.content.Intent;
import android.os.Build;
Solution content
package org.geometerplus.android.fbreader;

import android.app.ActionBar;
import android.app.ListActivity;
import android.content.Intent;
import android.os.Build;
File
TOCActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content
			setupFileInfo(book);
		}

<<<<<<< HEAD
=======
		setupButton(R.id.book_info_button_open, "openBook", new View.OnClickListener() {
			public void onClick(View view) {
				if (myDontReloadBook) {
					finish();
				} else {
					startActivity(
						new Intent(getApplicationContext(), FBReader.class)
							.setAction(Intent.ACTION_VIEW)
							.putExtra(FBReader.BOOK_PATH_KEY, myFile.getPath())
							.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
					);
				}
			}
		});
		setupButton(R.id.book_info_button_edit, "editInfo", new View.OnClickListener() {
			public void onClick(View view) {
				OrientationUtil.startActivityForResult(
					BookInfoActivity.this,
					new Intent(getApplicationContext(), EditBookInfoActivity.class)
						.putExtra(CURRENT_BOOK_PATH_KEY, myFile.getPath()),
					1
				);
			}
		});
		setupButton(R.id.book_info_button_reload, "reloadInfo", new View.OnClickListener() {
			public void onClick(View view) {
				if (book != null) {
					book.reloadInfoFromFile();
					setupBookInfo(book);
					myDontReloadBook = false;
					myResult = Math.max(myResult, FBReader.RESULT_RELOAD_BOOK);
					setResult(myResult);
				}
			}
		});

>>>>>>> e94e59ef5b36e101801e6c0e8648db41908cb16e
		final View root = findViewById(R.id.book_info_root);
		root.invalidate();
		root.requestLayout();
Solution content
			setupFileInfo(book);
		}

		final View root = findViewById(R.id.book_info_root);
		root.invalidate();
		root.requestLayout();
File
BookInfoActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation