Projects >> packages_apps_Settings >>88e7aaca923f8574c07a7ba72954cd0089cde147

Chunk
Conflicting content 
import android.widget.CompoundButton;
import android.widget.Filter;
import android.widget.Filterable;
<<<<<<< HEAD
import android.widget.ImageView;
=======
>>>>>>> 28600d29f332da611350f5a40440182bb78bde7c
import android.widget.ListView;
import android.widget.SearchView;
import android.widget.TextView;
Solution content 
import android.widget.CompoundButton;
import android.widget.Filter;
import android.widget.Filterable;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.SearchView;
import android.widget.TextView;
File
PrintServiceSettingsFragment.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            }
        });

<<<<<<< HEAD
        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
=======
        getListView().setEnabled(false);
>>>>>>> 28600d29f332da611350f5a40440182bb78bde7c
        getListView().setAdapter(mPrintersAdapter);
    }
Solution content 
            }
        });

        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
        getListView().setAdapter(mPrintersAdapter);
    }
File
PrintServiceSettingsFragment.java
Developer's decision
Version 1
Kind of conflict
Method invocation