Projects >> android-arabic-reader >>0a23c1e2a635042137ac3d8e2f6144f14007baea

Chunk
Conflicting content
			setupFileInfo(myBook);
		}

<<<<<<< HEAD
=======
		setupButton(R.id.book_info_button_open, "openBook", new View.OnClickListener() {
			public void onClick(View view) {
				if (myDontReloadBook) {
					finish();
				} else {
					FBReader.openBookActivity(BookInfoActivity.this, myBook, null);
				}
			}
		});
		setupButton(R.id.book_info_button_edit, "edit", new View.OnClickListener() {
			public void onClick(View view) {
				final Intent intent =
					new Intent(getApplicationContext(), EditBookInfoActivity.class);
				FBReaderIntents.putBookExtra(intent, myBook);
				OrientationUtil.startActivity(BookInfoActivity.this, intent);
			}
		});
		setupButton(R.id.book_info_button_reload, "reloadInfo", new View.OnClickListener() {
			public void onClick(View view) {
				if (myBook != null) {
					myBook.reloadInfoFromFile();
					setupBookInfo(myBook);
					myDontReloadBook = false;
			}
					myCollection.bindToService(BookInfoActivity.this, new Runnable() {
						public void run() {
							myCollection.saveBook(myBook);
						}
					});
				}
		});

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

		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