Projects >> android-frameworks-base-with-screenshot-tweaks >>21373aaef203ef442f435577ce4641c6b1a3030a

Chunk
Conflicting content 
    private AutoCompleteTextView.ListSelectorHider mHideSelector;

<<<<<<< HEAD
    // Indicates whether this AutoCompleteTextView is attached to a window or not
    // The widget is attached to a window when mAttachCount > 0
    private int mAttachCount;
    
=======
>>>>>>> 174231d89adf4a01f28e6074eb8f743240400c26
    private AutoCompleteTextView.PassThroughClickListener mPassThroughClickListener;

    public AutoCompleteTextView(Context context) {
Solution content 
    private AutoCompleteTextView.ListSelectorHider mHideSelector;

    private AutoCompleteTextView.PassThroughClickListener mPassThroughClickListener;

    public AutoCompleteTextView(Context context) {
File
AutoCompleteTextView.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment