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

Commit 3880abe9 authored by takuo's avatar takuo
Browse files

Merge remote branch 'cyanogen/eclair' into eclair

parents f14d3f6b b90039a4

src/com/android/contacts/DialtactsActivity.java

+19 −0
Original line number Diff line number Diff line
@@ -84,8 +84,27 @@ public class DialtactsActivity extends TabActivity implements TabHost.OnTabChang 
        mTabHost = getTabHost();

        mTabHost.setOnTabChangedListener(this);



        String componentName = intent.getComponent().getClassName();

	/* If intent is to view the Contacts List, prevent Dialer tab

	 * from being set as current tab.

	 */

        if (!getClass().getName().equals(componentName) &&

	    !FAVORITES_ENTRY_COMPONENT.equals(componentName)) {

            mTabHost.setAvoidFirstTabLoad(true);

	}



        // Setup the tabs

        setupDialerTab();



	/* If intent is to view the Contacts List, restore the state of mTabhost so

	 * that the rest of the application semantics remains unchanged.

	 */

        if (!getClass().getName().equals(componentName) &&

	    !FAVORITES_ENTRY_COMPONENT.equals(componentName)) {

	    mTabHost.setCurrentTabToZero();

	    mTabHost.setAvoidFirstTabLoad(false);

	}



        setupCallLogTab();

        setupContactsTab();

        setupFavoritesTab();

src/com/android/contacts/ExportVCardActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ public class ExportVCardActivity extends Activity { 
        public void onClick(DialogInterface dialog, int which) {

            if (which == DialogInterface.BUTTON_POSITIVE) {

                mActualExportThread = new ActualExportThread(mFileName);

                mActualExportThread.start();

                showDialog(R.id.dialog_exporting_vcard);

                mActualExportThread.start();

            }

        }

    }

src/com/android/contacts/TwelveKeyDialer.java

+1 −9
Original line number Diff line number Diff line
@@ -252,15 +252,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 


        mDialpad = findViewById(R.id.dialpad);  // This is null in landscape mode.



        // In landscape we put the keyboard in phone mode.

        // In portrait we prevent the soft keyboard to show since the

        // dialpad acts as one already.

        if (null == mDialpad) {

        mDigits.setInputType(android.text.InputType.TYPE_CLASS_PHONE);

        } else {

            mDigits.setInputType(android.text.InputType.TYPE_NULL);

        }



        // Set up the "dialpad chooser" UI; see showDialpadChooser().

        mDialpadChooser = (ListView) findViewById(R.id.dialpadChooser);

        mDialpadChooser.setOnItemClickListener(this);