commit 8571dd3953ddf2cf8442335657a1945487d665a1
author Brian Attwell <brianattwell@google.com> Mon Jun 23 23:29:10 2014 -0700
committer Brian Attwell <brianattwell@google.com> Tue Jun 24 16:13:52 2014 -0700
tree b09fa3109a449de0425e06de4e1f937667832327
parent 29c98071e53e106156932723063311ffd41e1960

Download hi res photo when viewing QC

Needed to change some color handling code in order to write this
CL. While I was looking at the color code, I added support for
coloring the ExpandingCardView assets the correct color.

Change-Id: I8e4cf1d0c1507f56d54c3f95fa904f88c4f1f84e

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

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index c222aff..99d8094 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -154,6 +154,7 @@
     private ColorDrawable mWindowScrim;
     private boolean mIsWaitingForOtherPieceOfExitAnimation;
     private boolean mIsExitAnimationInProgress;
+    private boolean mHasComputedThemeColor;
 
     private static final int MIN_NUM_COMMUNICATION_ENTRIES_SHOWN = 3;
     private static final int MIN_NUM_COLLAPSED_RECENT_ENTRIES_SHOWN = 3;
@@ -426,6 +427,7 @@
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         mHasAlreadyBeenOpened = true;
+        mHasComputedThemeColor = false;
         processIntent(intent);
     }
 
@@ -789,9 +791,18 @@
             @Override
             protected void onPostExecute(Integer color) {
                 super.onPostExecute(color);
-                // Make sure the color is valid. Also check that the Photo has not changed. If it
-                // has changed, the new tint color needs to be extracted
-                if (color != 0 && imageViewDrawable == mPhotoView.getDrawable()) {
+                if (mHasComputedThemeColor) {
+                    // If we had previously computed a theme color from the contact photo,
+                    // then do not update the theme color. Changing the theme color several
+                    // seconds after QC has started, as a result of an updated/upgraded photo,
+                    // is a jarring experience. On the other hand, changing the theme color after
+                    // a rotation or onNewIntent() is perfectly fine.
+                    return;
+                }
+                // Check that the Photo has not changed. If it has changed, the new tint
+                // color needs to be extracted
+                if (imageViewDrawable == mPhotoView.getDrawable()) {
+                    mHasComputedThemeColor = true;
                     setThemeColor(color);
                 }
             }
@@ -803,7 +814,6 @@
         if (color == 0) {
             color = getResources().getColor(R.color.actionbar_background_color);
         }
-        // TODO: animate from the previous tint.
         mScroller.setHeaderTintColor(color);
 
         // Create a darker version of the actionbar color. HSV is device dependent
@@ -813,8 +823,8 @@
         Color.colorToHSV(color, hsvComponents);
         hsvComponents[2] *= SYSTEM_BAR_BRIGHTNESS_FACTOR;
         mStatusBarColor = Color.HSVToColor(hsvComponents);
-
         updateStatusBarColor();
+
         mColorFilter =
                 new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP);
         mCommunicationCard.setColorAndFilter(color, mColorFilter);
@@ -973,7 +983,7 @@
             // contact is invisible. If it is, we need to display an "Add to Contacts" MenuItem.
             return new ContactLoader(getApplicationContext(), mLookupUri,
                     true /*loadGroupMetaData*/, false /*loadInvitableAccountTypes*/,
-                    false /*postViewNotification*/, true /*computeFormattedPhoneNumber*/);
+                    true /*postViewNotification*/, true /*computeFormattedPhoneNumber*/);
         }
     };