| Chunk |
|---|
| Conflicting content |
|---|
* that can be displayed when a TwoLineListItem has focus. Android supplies a
* {@link android.R.layout#two_line_list_item standard layout resource for TwoLineListView}
* (which does not include a selected item icon), but you can design your own custom XML
<<<<<<< HEAD
* layout for this object.
=======
* layout for this object as shown in the Phone Application.
* (packages/apps/Phone/res/layout/dialer_list_item.xml)
>>>>>>> b41349409b75cdc23558241eeb255e4ac4f46222
*
* @attr ref android.R.styleable#TwoLineListItem_mode
*/ |
| Solution content |
|---|
* that can be displayed when a TwoLineListItem has focus. Android supplies a
* {@link android.R.layout#two_line_list_item standard layout resource for TwoLineListView}
* (which does not include a selected item icon), but you can design your own custom XML
* layout for this object.
*
* @attr ref android.R.styleable#TwoLineListItem_mode
*/ |
| File |
|---|
| TwoLineListItem.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |