Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f8d404 authored by Ben Lin's avatar Ben Lin
Browse files

Fix a merge conflict miss that caused regression. 

Originally, commit Iee6f55c677a52664d6fd6e16d760510081d5d867 fixed an
issue where views were getting added everytime screen locks on/off.
Commit Ibef5b21af2a5f25839222880e2b63f0ceee74d06 however missed a line,
and caused regression when resolving conflict.

Bug: 63396744

Change-Id: I5bd323a83026cfb2b3843bc6e5cd57fe35b21788
parent bba7aea4

src/com/android/documentsui/inspector/DetailsView.java

+3 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.function.Consumer; 
 */

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);
@@ -49,11 +49,12 @@ public class DetailsView extends TableView implements Consumer<DocumentInfo> { 


    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);

        }

    }