diff options
| author | Yorke Lee <yorkelee@google.com> | 2012-11-08 15:48:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 15:48:11 -0800 |
| commit | 483affc0a8ed6dadc2154c0a4fa6f365ce3e286f (patch) | |
| tree | 2c34101cab02834ae669c3d6ca6af33852890674 | |
| parent | 103b9c3614c7ed20acd4ad755a227eae84f8b6bc (diff) | |
| parent | f455a204fe3924e01c38649cce76c8d700ba8504 (diff) | |
| download | Contacts-jb-mr1-dev-plus-aosp.tar.gz | |
am f455a204: am b6ae7361: Merge "Changed Quick Contacts details Button to ImageView" into jb-mr1.1-devjb-mr1-dev-plus-aosp
* commit 'f455a204fe3924e01c38649cce76c8d700ba8504':
Changed Quick Contacts details Button to ImageView
| -rw-r--r-- | res/layout/quickcontact_photo_container.xml | 6 | ||||
| -rw-r--r-- | src/com/android/contacts/quickcontact/QuickContactActivity.java | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml index e970934db..adb647d37 100644 --- a/res/layout/quickcontact_photo_container.xml +++ b/res/layout/quickcontact_photo_container.xml @@ -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" diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 25fb3f4d8..16814dc36 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -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(); |