Use Toolbar for QC
* Moved star, add and edit buttons into Toolbar
* Fixed implementation of add/edit: copied the
ContractDetailFragment implementation
* Added unimplemented Share and Place on Home menu items
* Deleted some of the quickcontact_activity.xml files
* No longer handle click events on Contact photo view
Change-Id: Id333b11e89d8755ace600700be15077fd47b6172
diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index 9af1079..a7c12dd 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -24,14 +24,28 @@
android:focusableInTouchMode="true"
android:descendantFocusability="afterDescendants" >
- <!-- Will contain ToolBar and image behind ToolBar -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/quickcontact_maximum_header_height"
android:layout_marginTop="@dimen/quickcontact_starting_empty_height"
android:background="@color/card_margin_color"
android:id="@+id/toolbar_parent">
- <include layout="@layout/quickcontact_photo_container" />
+
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop"
+ android:contentDescription="@string/description_contact_photo" />
+
+ <!-- Need to set a non null background on Toolbar in order for MenuItem
+ ripples to be drawn on this view, instead of another-->
+ <Toolbar
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"
+ android:background="#00000000"
+ android:id="@+id/toolbar"/>
+
</FrameLayout>
<com.android.contacts.widget.TouchlessScrollView