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

Commit c228b629 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

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

parents 676c463d 6219668d

res/layout/quickcontact_photo_container.xml

+2 −1
Original line number Diff line number Diff line
@@ -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

+6 −2
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public class QuickContactActivity extends Activity { 
    private View mSelectedTabRectangle;

    private View mLineAfterTrack;



    private ImageView mPhotoView;

    private ImageView mOpenDetailsImage;

    private ImageView mStarImage;

    private ViewPager mListPager;
@@ -237,8 +238,12 @@ public class QuickContactActivity extends Activity { 


        // 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 @@ public class QuickContactActivity extends Activity { 


        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