commit c228b629bbef4ffe72db98907e1884c8648cc0ec
author Yorke Lee <yorkelee@google.com> Mon Sep 09 14:08:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 14:08:04 2013 +0000
tree ccead0eb9d26fd23ab3b603a95c3b68bcc73a66d
parent 676c463dd1ed91272fe177f54fc93990b8e362c4
parent 6219668d0612f7522bd15a9d34c6232cb15b9a6c

Merge "Make quick contact photo clickable" into klp-dev

res/layout/quickcontact_photo_container.xml

diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml
index 1ede26d..293278c 100644
--- a/res/layout/quickcontact_photo_container.xml
+++ b/res/layout/quickcontact_photo_container.xml
@@ -24,7 +24,8 @@
             android:id="@+id/photo"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            android:clickable="true" />
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"

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 c1cfb55..0c4369c 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -112,6 +112,7 @@
     private View mSelectedTabRectangle;
     private View mLineAfterTrack;
 
+    private ImageView mPhotoView;
     private ImageView mOpenDetailsImage;
     private ImageView mStarImage;
     private ViewPager mListPager;
@@ -237,8 +238,12 @@
 
         // find and prepare correct header view
         mPhotoContainer = findViewById(R.id.photo_container);
+
         setHeaderNameText(R.id.name, R.string.missing_name);
 
+        mPhotoView = (ImageView) mPhotoContainer.findViewById(R.id.photo);
+        mPhotoView.setOnClickListener(openDetailsClickHandler);
+
         mStopWatch.lap("v"); // view initialized
 
         SchedulingUtils.doAfterLayout(mFloatingLayout, new Runnable() {
@@ -372,8 +377,7 @@
 
         mStopWatch.lap("sph"); // Start photo setting
 
-        final ImageView photoView = (ImageView) mPhotoContainer.findViewById(R.id.photo);
-        mPhotoSetter.setupContactPhoto(data, photoView);
+        mPhotoSetter.setupContactPhoto(data, mPhotoView);
 
         mStopWatch.lap("ph"); // Photo set