Merge remote branch 'cyanogen/eclair' into eclair

3 files changed, 22 insertions, 11 deletions

diff --git a/src/com/android/contacts/DialtactsActivity.java b/src/com/android/contacts/DialtactsActivity.java
index 4209f1c17..e9c18c7c1 100644
--- a/src/com/android/contacts/DialtactsActivity.java
+++ b/src/com/android/contacts/DialtactsActivity.java
@@ -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();
diff --git a/src/com/android/contacts/ExportVCardActivity.java b/src/com/android/contacts/ExportVCardActivity.java
index baf2371d9..ea3b1d90c 100644
--- a/src/com/android/contacts/ExportVCardActivity.java
+++ b/src/com/android/contacts/ExportVCardActivity.java
@@ -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();
             }
         }
     }
@@ -451,4 +451,4 @@ public class ExportVCardActivity extends Activity {
     public String getErrorReason() {
         return mErrorReason;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/contacts/TwelveKeyDialer.java b/src/com/android/contacts/TwelveKeyDialer.java
index 258375a3d..c6a0e1d2b 100644
--- a/src/com/android/contacts/TwelveKeyDialer.java
+++ b/src/com/android/contacts/TwelveKeyDialer.java
@@ -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);
-        }
-
+        mDigits.setInputType(android.text.InputType.TYPE_CLASS_PHONE);
         // Set up the "dialpad chooser" UI; see showDialpadChooser().
         mDialpadChooser = (ListView) findViewById(R.id.dialpadChooser);
         mDialpadChooser.setOnItemClickListener(this);