Projects >> platform_packages_apps_contacts >>422e66a0ea98130628ad5e5bfb97046c947432ac

Chunk
Conflicting content 
                .setIndicator(getText(R.string.contactsIconLabel),

    private void setupContactsTab() {
        Intent intent = new Intent(UI.LIST_DEFAULT);
<<<<<<< HEAD
        intent.setClass(this, ContactBrowserActivity.class);
=======
        intent.setClass(this, ContactsListActivity.class);
        StickyTabs.setTab(intent, TAB_INDEX_CONTACTS);
>>>>>>> fecf3e902ddd9cfeb4cbf672ff991c9a48074744

        mTabHost.addTab(mTabHost.newTabSpec("contacts")
Solution content 
    private void setupContactsTab() {
        Intent intent = new Intent(UI.LIST_DEFAULT);
        intent.setClass(this, ContactBrowserActivity.class);

        mTabHost.addTab(mTabHost.newTabSpec("contacts")
                .setIndicator(getText(R.string.contactsIconLabel),
File
DialtactsActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 

    private void setupFavoritesTab() {
        Intent intent = new Intent(UI.LIST_STREQUENT_ACTION);
<<<<<<< HEAD
        intent.setClass(this, ContactBrowserActivity.class);
=======
        intent.setClass(this, ContactsListActivity.class);
        StickyTabs.setTab(intent, TAB_INDEX_FAVORITES);
>>>>>>> fecf3e902ddd9cfeb4cbf672ff991c9a48074744
        mTabHost.addTab(mTabHost.newTabSpec("favorites")
                .setIndicator(getString(R.string.contactsFavoritesLabel),
Solution content 
    private void setupFavoritesTab() {
        Intent intent = new Intent(UI.LIST_STREQUENT_ACTION);
        intent.setClass(this, ContactBrowserActivity.class);

        mTabHost.addTab(mTabHost.newTabSpec("favorites")
                .setIndicator(getString(R.string.contactsFavoritesLabel),
File
DialtactsActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        intent.putExtra(EXTRA_IGNORE_STATE, true);

        // Choose the tab based on the inbound intent
<<<<<<< HEAD
        if (intent.getBooleanExtra(ContactsFrontDoor.EXTRA_FRONT_DOOR, false)) {
            // Launched through the contacts front door, set the proper contacts tab
            setContactsTab();
        } else {
            // Not launched through the front door, look at the component to determine the tab
            String componentName = intent.getComponent().getClassName();
            if (getClass().getName().equals(componentName)) {
                if (recentCallsRequest) {
                    mTabHost.setCurrentTab(TAB_INDEX_CALL_LOG);
                } else {
                    mTabHost.setCurrentTab(TAB_INDEX_DIALER);
                }
            } else if (FAVORITES_ENTRY_COMPONENT.equals(componentName)) {
=======
        String componentName = intent.getComponent().getClassName();
        if (getClass().getName().equals(componentName)) {
            if (phoneIsInUse()) {
                // If we are in a call, show the dialer tab (which allows going back to the
                // call)
                mTabHost.setCurrentTab(TAB_INDEX_DIALER);
            } else {
                // If we are launched from history (long-press home), go back to the last
                // tab that was used to make a call
                if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0) {
                    mTabHost.setCurrentTab(StickyTabs.loadTab(this, TAB_INDEX_DIALER));
                }
            }
        } else if (FAVORITES_ENTRY_COMPONENT.equals(componentName)) {
            mTabHost.setCurrentTab(TAB_INDEX_FAVORITES);
        } else {
            // Launched as "Contacts" --> Go either to favorites or contacts, whichever is more
            // recent
            final SharedPreferences prefs = getSharedPreferences(StickyTabs.PREFERENCES_NAME,
                    MODE_PRIVATE);
            final boolean favoritesAsContacts = prefs.getBoolean(PREF_FAVORITES_AS_CONTACTS,
                    PREF_FAVORITES_AS_CONTACTS_DEFAULT);
            if (favoritesAsContacts) {
>>>>>>> fecf3e902ddd9cfeb4cbf672ff991c9a48074744
                mTabHost.setCurrentTab(TAB_INDEX_FAVORITES);
            } else if (CONTACTS_LAUNCH_ACTIVITY.equals(componentName)) {
                mTabHost.setCurrentTab(mLastManuallySelectedTab);
Solution content 
                mTabHost.setCurrentTab(mLastManuallySelectedTab);
                mTabHost.setCurrentTab(TAB_INDEX_FAVORITES);
            } else if (CONTACTS_LAUNCH_ACTIVITY.equals(componentName)) {
        intent.putExtra(EXTRA_IGNORE_STATE, true);

        // Remember the old manually selected tab index so that it can be restored if it is
        // overwritten by one of the programmatic tab selections
        final int savedTabIndex = mLastManuallySelectedTab;

        // Choose the tab based on the inbound intent
        if (intent.getBooleanExtra(ContactsFrontDoor.EXTRA_FRONT_DOOR, false)) {
            // Launched through the contacts front door, set the proper contacts tab
            setContactsTab();
        } else {
            // Not launched through the front door, look at the component to determine the tab
            String componentName = intent.getComponent().getClassName();
            if (getClass().getName().equals(componentName)) {
                if (recentCallsRequest) {
                    mTabHost.setCurrentTab(TAB_INDEX_CALL_LOG);
                } else {
                    mTabHost.setCurrentTab(TAB_INDEX_DIALER);
                }
            } else if (FAVORITES_ENTRY_COMPONENT.equals(componentName)) {
File
DialtactsActivity.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
    }

    void callVoicemail() {
<<<<<<< HEAD
        startActivity(newVoicemailIntent());
        mDigits.getText().clear(); // TODO: Fix bug 1745781
=======
        StickyTabs.saveTab(this, getIntent());
        Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
                Uri.fromParts("voicemail", EMPTY_NUMBER, null));
        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        startActivity(intent);
        mDigits.getText().clear();
>>>>>>> fecf3e902ddd9cfeb4cbf672ff991c9a48074744
        finish();
    }
Solution content 
    }

    void callVoicemail() {
        startActivity(newVoicemailIntent());
        mDigits.getText().clear(); // TODO: Fix bug 1745781
        finish();
    }
File
TwelveKeyDialer.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
        } else {
            final String number = mDigits.getText().toString();

<<<<<<< HEAD
            startActivity(newDialNumberIntent(number));
            mDigits.getText().clear();  // TODO: Fix bug 1745781
=======
        StickyTabs.saveTab(this, getIntent());
        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        startActivity(intent);
        mDigits.getText().clear();

        // Don't finish TwelveKeyDialer yet if we're sending a blank flash for CDMA. CDMA
        // networks use Flash messages when special processing needs to be done, mainly for
        // 3-way or call waiting scenarios. Presumably, here we're in a special 3-way scenario
        // where the network needs a blank flash before being able to add the new participant.
        // (This is not the case with all 3-way calls, just certain CDMA infrastructures.)
        if (!sendEmptyFlash) {
>>>>>>> fecf3e902ddd9cfeb4cbf672ff991c9a48074744
            finish();
        }
    }
Solution content 
        } else {
            final String number = mDigits.getText().toString();

            startActivity(newDialNumberIntent(number));
            mDigits.getText().clear();  // TODO: Fix bug 1745781
            finish();
        }
    }
File
TwelveKeyDialer.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation