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

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

Merge "Changed Quick Contacts details Button to ImageView" into jb-mr1.1-dev

parents bafdfcb8 9d85a2a3

res/layout/quickcontact_photo_container.xml

+3 −3
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ 
            android:layout_alignLeft="@id/photo"

            android:layout_alignRight="@id/photo"

            android:background="#7F000000" />

        <ImageButton

            android:id="@+id/open_details_button"

        <ImageView

            android:id="@+id/contact_details_image"

            android:src="@drawable/ic_contacts_holo_dark"

            android:background="?android:attr/selectableItemBackground"

            android:contentDescription="@null"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_marginRight="16dip"

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

+3 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class QuickContactActivity extends Activity { 
    private View mSelectedTabRectangle;

    private View mLineAfterTrack;



    private ImageButton mOpenDetailsButton;

    private ImageView mOpenDetailsImage;

    private ImageButton mOpenDetailsPushLayerButton;

    private ViewPager mListPager;
@@ -196,7 +196,7 @@ public class QuickContactActivity extends Activity { 
        mFloatingLayout = (FloatingChildLayout) findViewById(R.id.floating_layout);

        mTrack = (ViewGroup) findViewById(R.id.track);

        mTrackScroller = (HorizontalScrollView) findViewById(R.id.track_scroller);

        mOpenDetailsButton = (ImageButton) findViewById(R.id.open_details_button);

        mOpenDetailsImage = (ImageView) findViewById(R.id.contact_details_image);

        mOpenDetailsPushLayerButton = (ImageButton) findViewById(R.id.open_details_push_layer);

        mListPager = (ViewPager) findViewById(R.id.item_list_pager);

        mSelectedTabRectangle = findViewById(R.id.selected_tab_rectangle);
@@ -220,7 +220,6 @@ public class QuickContactActivity extends Activity { 
                close(false);

            }

        };

        mOpenDetailsButton.setOnClickListener(openDetailsClickHandler);

        mOpenDetailsPushLayerButton.setOnClickListener(openDetailsClickHandler);

        mListPager.setAdapter(new ViewPagerAdapter(getFragmentManager()));

        mListPager.setOnPageChangeListener(new PageChangeListener());
@@ -333,7 +332,7 @@ public class QuickContactActivity extends Activity { 
        final ResolveCache cache = ResolveCache.getInstance(this);

        final Context context = this;



        mOpenDetailsButton.setVisibility(isMimeExcluded(Contacts.CONTENT_ITEM_TYPE) ? View.GONE

        mOpenDetailsImage.setVisibility(isMimeExcluded(Contacts.CONTENT_ITEM_TYPE) ? View.GONE

                : View.VISIBLE);



        mDefaultsMap.clear();