Show sources / Hide sources UI in the view card.
Change-Id: Iee14c66c0b9b065403778c6b8e4cb1273a02ee65
diff --git a/res/drawable-hdpi-finger/ic_list_split.png b/res/drawable-hdpi-finger/ic_list_split.png
new file mode 100644
index 0000000..92f486b
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_list_split.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_sources.png b/res/drawable-hdpi/ic_menu_sources.png
new file mode 100644
index 0000000..45355e2
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_sources.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/ic_list_split.png b/res/drawable-mdpi-finger/ic_list_split.png
new file mode 100644
index 0000000..cbaab12
--- /dev/null
+++ b/res/drawable-mdpi-finger/ic_list_split.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_sources.png b/res/drawable-mdpi/ic_menu_sources.png
new file mode 100644
index 0000000..78cdaca
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_sources.png
Binary files differ
diff --git a/res/layout-finger/contact_card_layout.xml b/res/layout-finger/contact_card_layout.xml
index 899f354..acfd8cb 100644
--- a/res/layout-finger/contact_card_layout.xml
+++ b/res/layout-finger/contact_card_layout.xml
@@ -14,33 +14,46 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.contacts.ReverseZOrderLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_root_view"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
-
+
<com.android.internal.widget.ContactHeaderWidget
android:id="@+id/contact_header_widget"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
-
- <com.android.contacts.ScrollingTabWidget android:id="@+id/tab_widget"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"/>
-
- <FrameLayout android:id="@android:id/tabcontent"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1">
- <View
- android:layout_width="fill_parent"
+ <LinearLayout
+ android:id="@+id/below_header"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <!-- <View
+ android:id="@+id/buffer_view"
android:layout_height="wrap_content"
- android:background="@drawable/title_bar_shadow"
- />
- </FrameLayout>
-
+ android:layout_width="fill_parent"
+ /> -->
+
+ <com.android.contacts.ScrollingTabWidget android:id="@+id/tab_widget"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+
+ <FrameLayout android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1">
-</LinearLayout>
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/title_bar_shadow"
+ />
+ </FrameLayout>
+
+ </LinearLayout>
+
+</com.android.contacts.ReverseZOrderLinearLayout>
diff --git a/res/layout-finger/tab_indicator.xml b/res/layout-finger/tab_indicator.xml
index 1158eb0..d43265c 100644
--- a/res/layout-finger/tab_indicator.xml
+++ b/res/layout-finger/tab_indicator.xml
@@ -16,7 +16,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="40dip"
+ android:layout_height="@dimen/tab_height"
android:layout_weight="1"
android:layout_marginLeft="-3dip"
android:layout_marginRight="-3dip"
diff --git a/res/menu/view.xml b/res/menu/view.xml
index 48cbeb1..5df87e6 100644
--- a/res/menu/view.xml
+++ b/res/menu/view.xml
@@ -33,11 +33,17 @@
android:title="@string/menu_contactOptions" />
<!-- TODO: use new split/join icons -->
+
<item
- android:id="@+id/menu_split"
- android:icon="@drawable/ic_menu_split"
- android:title="@string/menu_splitAggregate" />
-
+ android:id="@+id/menu_show_sources"
+ android:icon="@drawable/ic_menu_sources"
+ android:title="@string/menu_showSources" />
+
+ <item
+ android:id="@+id/menu_hide_sources"
+ android:icon="@drawable/ic_menu_sources"
+ android:title="@string/menu_hideSources" />
+
<item
android:id="@+id/menu_join"
android:icon="@drawable/ic_menu_merge"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c4384d7..0742250 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,4 +17,7 @@
<resources>
<dimen name="fasttrack_shadow">37dip</dimen>
<dimen name="edit_photo_size">76dip</dimen>
+
+ <!-- The height of the ScrollingTabWidget -->
+ <dimen name="tab_height">40dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d0c77b2..e181ab3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -116,7 +116,7 @@
<string name="menu_makeDefaultNumber">Make default number</string>
<!-- Menu item that makes an email address the default for a contact. The default email used
- when you try to email a contact without specifying a specific address. -->
+ when you try to email a contact without specifying a specific address. -->
<string name="menu_makeDefaultEmail">Make default email</string>
<!-- Menu item that splits an item from the contact detail into a separate aggregate -->
@@ -130,6 +130,10 @@
<!-- Menu item that joins an aggregate with another aggregate -->
<string name="menu_joinAggregate">Join</string>
+
+ <!-- Menu item to toggle the tabs that show where the contact data comes from. -->
+ <string name="menu_showSources">Show sources</string>
+ <string name="menu_hideSources">Hide sources</string>
<!-- Activity title for the Join Contact list -->
<string name="titleJoinAggregate">Join contact</string>
@@ -1108,5 +1112,10 @@
<string name="name_phonetic_middle">Phonetic middle name</string>
<!-- Field title for the phonetic family name of a contact -->
<string name="name_phonetic_family">Phonetic family name</string>
+
+ <!-- The title for the action to remove a contact from an aggregated contact -->
+ <string name="split_label">Split</string>
+ <!-- The explanation of what "split" will do. This needs word-smithing. -->
+ <string name="split_explanation">Make this data its own contact.</string>
</resources>
