| Chunk |
|---|
| Conflicting content |
|---|
.setCancelable(true)
.setTitle(String.format(getString(R.string.title_load_setting_set), settingSet))
.setAdapter(createSettingSetContentsAdapter(settingSet), null)
<<<<<<< HEAD
=======
.setView(ViewHelper.createSimpleTextView(this, R.string.text_setting_set_name, settingSet))
>>>>>>> 56e0fe75727163e7ec8dbbcff6d312e2b1347c1d
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
| Solution content |
|---|
.setCancelable(true)
.setTitle(String.format(getString(R.string.title_load_setting_set), settingSet))
.setAdapter(createSettingSetContentsAdapter(settingSet), null)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
| File |
|---|
| SettingsActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |