Projects >> packages_apps_Contacts >>e2cbf21de8717e3b182709527080b732242eaa42

Chunk
Conflicting content 
 * Manages user preferences for contacts.
 */
public final class ContactsPreferences extends ContentObserver {
<<<<<<< HEAD:src/com/android/contacts/preference/ContactsPreferences.java

    public static final String PREF_DISPLAY_ONLY_PHONES = "only_phones";
    public static final boolean PREF_DISPLAY_ONLY_PHONES_DEFAULT = false;

=======
>>>>>>> 71f16f90d71ce8d9eeb79710841cc680a3bf0541:src/com/android/contacts/ui/ContactsPreferences.java
    private Context mContext;
    private int mSortOrder = -1;
    private int mDisplayOrder = -1;
Solution content 
 * Manages user preferences for contacts.
 */
public final class ContactsPreferences extends ContentObserver {

    public static final String PREF_DISPLAY_ONLY_PHONES = "only_phones";
    public static final boolean PREF_DISPLAY_ONLY_PHONES_DEFAULT = false;

    private Context mContext;
    private int mSortOrder = -1;
    private int mDisplayOrder = -1;
File
ContactsPreferences.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    public void registerChangeListener(ChangeListener listener) {
        if (mListener != null) unregisterChangeListener();

<<<<<<< HEAD:src/com/android/contacts/preference/ContactsPreferences.java
        mListener = listener;

        // Reset preferences to "unknown" because they may have changed while the
        // observer was unregistered.
        mDisplayOrder = -1;
        mSortOrder = -1;

        final ContentResolver contentResolver = mContext.getContentResolver();
        contentResolver.registerContentObserver(
                Settings.System.getUriFor(
                        ContactsContract.Preferences.SORT_ORDER), false, this);
        contentResolver.registerContentObserver(
                Settings.System.getUriFor(
                        ContactsContract.Preferences.DISPLAY_ORDER), false, this);
    }

    public void unregisterChangeListener() {
        if (mListener != null) {
            mContext.getContentResolver().unregisterContentObserver(this);
            mListener = null;
        }
=======
        // We didn't watch before, so ensure that we actually forget our cache here
        mSortOrder = -1;
        mDisplayOrder = -1;

        mListener = listener;
        final ContentResolver contentResolver = mContext.getContentResolver();
        contentResolver.registerContentObserver(
                Settings.System.getUriFor(
                        ContactsContract.Preferences.SORT_ORDER), false, this);
        contentResolver.registerContentObserver(
                Settings.System.getUriFor(
                        ContactsContract.Preferences.DISPLAY_ORDER), false, this);
    }

    public void unregisterChangeListener() {
        if (mListener != null) {
            mContext.getContentResolver().unregisterContentObserver(this);
            mListener = null;
        }
    }

    @Override
    public void onChange(boolean selfChange) {
        // This notification is not sent on the Ui thread. Use the previously created Handler
        // to switch to the Ui thread
        mHandler.post(new Runnable() {
            @Override
            public void run() {
                mSortOrder = -1;
                mDisplayOrder = -1;
                if (mListener != null) mListener.onChange();
            }
        });
    }

    public interface ChangeListener {
        void onChange();
>>>>>>> 71f16f90d71ce8d9eeb79710841cc680a3bf0541:src/com/android/contacts/ui/ContactsPreferences.java
    }

    @Override
Solution content 
    public void registerChangeListener(ChangeListener listener) {
        if (mListener != null) unregisterChangeListener();

        mListener = listener;

        // Reset preferences to "unknown" because they may have changed while the
        // observer was unregistered.
        mDisplayOrder = -1;
        mSortOrder = -1;

        final ContentResolver contentResolver = mContext.getContentResolver();
        contentResolver.registerContentObserver(
                Settings.System.getUriFor(
                        ContactsContract.Preferences.SORT_ORDER), false, this);
        contentResolver.registerContentObserver(
                Settings.System.getUriFor(
                        ContactsContract.Preferences.DISPLAY_ORDER), false, this);
    }

    public void unregisterChangeListener() {
        if (mListener != null) {
            mContext.getContentResolver().unregisterContentObserver(this);
            mListener = null;
        }
    }

    @Override
File
ContactsPreferences.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Comment
If statement
Interface signature
Method declaration
Method interface
Method invocation
Method signature
Variable