commit f3ea225f847f2a80decee89be81c6540e4d0fa0a
author Android (Google) Code Review <android-gerrit@google.com> Mon Dec 21 14:39:14 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 21 14:39:14 2009 -0800
tree 63e5c215244d7aa9aa3f834a5a42f85dc5cab617
parent ae4f42ec3a53665ca98d2d379f57f6626535e1dd
parent 4fd0c1a1fd87a7cee873f5a97abaee6069d7b5a0

Merge change I56e83543

* changes:
  Switching to the new sort key on Contacts

src/com/android/contacts/ui/QuickContactActivity.java

diff --git a/src/com/android/contacts/ui/QuickContactActivity.java b/src/com/android/contacts/ui/QuickContactActivity.java
index b5e445f..897d912 100644
--- a/src/com/android/contacts/ui/QuickContactActivity.java
+++ b/src/com/android/contacts/ui/QuickContactActivity.java
@@ -33,7 +33,7 @@
         QuickContactWindow.OnDismissListener {
     private static final String TAG = "QuickContactActivity";
 
-    static final boolean LOGV = true;
+    static final boolean LOGV = false;
     static final boolean FORCE_CREATE = false;
 
     private QuickContactWindow mQuickContact;
@@ -65,30 +65,13 @@
         final Bundle extras = intent.getExtras();
 
         // Read requested parameters for displaying
-        final Rect target = getTargetRect(intent);
+        final Rect target = intent.getSourceBounds();
         final int mode = extras.getInt(QuickContact.EXTRA_MODE, QuickContact.MODE_MEDIUM);
         final String[] excludeMimes = extras.getStringArray(QuickContact.EXTRA_EXCLUDE_MIMES);
 
         mQuickContact.show(lookupUri, target, mode, excludeMimes);
     }
 
-    private Rect getTargetRect(Intent intent) {
-        Rect target = intent.getSourceBounds();
-        if (target != null) {
-            return target;
-        }
-        final Bundle extras = intent.getExtras();
-        try {
-            target = (Rect)extras.getParcelable(QuickContact.EXTRA_TARGET_RECT);
-            if (target != null) {
-                return target;
-            }
-        } catch (ClassCastException ex) {
-            // fall through
-        }
-        return new Rect(0, 0, 0, 0);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onBackPressed() {

src/com/android/contacts/ui/QuickContactWindow.java

diff --git a/src/com/android/contacts/ui/QuickContactWindow.java b/src/com/android/contacts/ui/QuickContactWindow.java
index baf42ac..69a2801 100644
--- a/src/com/android/contacts/ui/QuickContactWindow.java
+++ b/src/com/android/contacts/ui/QuickContactWindow.java
@@ -323,6 +323,18 @@
             android.os.Debug.startMethodTracing(TRACE_TAG);
         }
 
+        // Validate incoming parameters
+        final boolean validMode = (mode == QuickContact.MODE_SMALL
+                || mode == QuickContact.MODE_MEDIUM || mode == QuickContact.MODE_LARGE);
+        if (!validMode) {
+            throw new IllegalArgumentException("Invalid mode, expecting MODE_LARGE, "
+                    + "MODE_MEDIUM, or MODE_SMALL");
+        }
+
+        if (anchor == null) {
+            throw new IllegalArgumentException("Missing anchor rectangle");
+        }
+
         // Prepare header view for requested mode
         mLookupUri = lookupUri;
         mAnchor = new Rect(anchor);