Merge "Fix a merge conflict miss that caused regression." into arc-apps

 */

public class DetailsView extends TableView implements Consumer<DocumentInfo> {

    private final Map<Integer, TextView> rows = new HashMap();

    private final Map<Integer, KeyValueRow> rows = new HashMap();

    public DetailsView(Context context) {

        this(context, null);

    private void setRow(@StringRes int keyId, String value) {

        if(rows.containsKey(keyId)) {

            rows.get(keyId).setText(value);

            rows.get(keyId).setValue(value);

        } else {

            KeyValueRow row = createKeyValueRow(this);

            row.setKey(keyId);

            row.setValue(value);

            rows.put(keyId, row);

        }

    }