Merge change 25602 into eclair
* changes:
Allow EditContactActivity to use a picker
diff --git a/res/drawable-finger/divider_vertical_dark.png b/res/drawable-finger/divider_vertical_dark.png
deleted file mode 100644
index dcf850e..0000000
--- a/res/drawable-finger/divider_vertical_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/frame_sm_track.9.png b/res/drawable-finger/frame_sm_track.9.png
deleted file mode 100644
index 5147392..0000000
--- a/res/drawable-finger/frame_sm_track.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/list_item_secondary_button.xml b/res/drawable-finger/list_item_secondary_button.xml
deleted file mode 100644
index c71d16f..0000000
--- a/res/drawable-finger/list_item_secondary_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/list_item_secondary_button_pressed" />
- <item android:state_focused="true"
- android:drawable="@drawable/list_item_secondary_button_selected" />
- <item
- android:drawable="@drawable/list_item_secondary_button_default" />
-</selector>
diff --git a/res/drawable-finger/list_item_secondary_button_default.9.png b/res/drawable-finger/list_item_secondary_button_default.9.png
deleted file mode 100644
index 7c627e2..0000000
--- a/res/drawable-finger/list_item_secondary_button_default.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/list_item_secondary_button_pressed.9.png b/res/drawable-finger/list_item_secondary_button_pressed.9.png
deleted file mode 100644
index 215397e..0000000
--- a/res/drawable-finger/list_item_secondary_button_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/list_item_secondary_button_selected.9.png b/res/drawable-finger/list_item_secondary_button_selected.9.png
deleted file mode 100644
index 21b59b1..0000000
--- a/res/drawable-finger/list_item_secondary_button_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/social_picture_border_in_list.9.png b/res/drawable-finger/social_picture_border_in_list.9.png
deleted file mode 100644
index 8fc6ab3..0000000
--- a/res/drawable-finger/social_picture_border_in_list.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/tab_divider.xml b/res/drawable-finger/tab_divider.xml
deleted file mode 100644
index 2590ce7..0000000
--- a/res/drawable-finger/tab_divider.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/tab_divider_res"
- android:height="48dip"
-/>
diff --git a/res/drawable-hdpi-finger/divider_vertical_dark.9.png b/res/drawable-hdpi-finger/divider_vertical_dark.9.png
new file mode 100644
index 0000000..30a68d0
--- /dev/null
+++ b/res/drawable-hdpi-finger/divider_vertical_dark.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_tab_selected_dialer.png b/res/drawable-hdpi-finger/ic_tab_selected_dialer.png
new file mode 100644
index 0000000..a84f8ab
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_tab_selected_dialer.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_tab_unselected_dialer.png b/res/drawable-hdpi-finger/ic_tab_unselected_dialer.png
new file mode 100644
index 0000000..51b0656
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_tab_unselected_dialer.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/tab_focused.9.png b/res/drawable-hdpi-finger/tab_focused.9.png
new file mode 100644
index 0000000..a65b8f5
--- /dev/null
+++ b/res/drawable-hdpi-finger/tab_focused.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_divider_res.9.png b/res/drawable-hdpi-finger/tab_focused_bottom.9.png
similarity index 65%
copy from res/drawable-finger/tab_divider_res.9.png
copy to res/drawable-hdpi-finger/tab_focused_bottom.9.png
index 3fdc372..2fe4a9b 100644
--- a/res/drawable-finger/tab_divider_res.9.png
+++ b/res/drawable-hdpi-finger/tab_focused_bottom.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/tab_left_arrow.png b/res/drawable-hdpi-finger/tab_left_arrow.png
new file mode 100644
index 0000000..c2274f1
--- /dev/null
+++ b/res/drawable-hdpi-finger/tab_left_arrow.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/tab_pressed.9.png b/res/drawable-hdpi-finger/tab_pressed.9.png
new file mode 100644
index 0000000..0f90065
--- /dev/null
+++ b/res/drawable-hdpi-finger/tab_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_divider_res.9.png b/res/drawable-hdpi-finger/tab_pressed_bottom.9.png
similarity index 65%
copy from res/drawable-finger/tab_divider_res.9.png
copy to res/drawable-hdpi-finger/tab_pressed_bottom.9.png
index 3fdc372..00361aa 100644
--- a/res/drawable-finger/tab_divider_res.9.png
+++ b/res/drawable-hdpi-finger/tab_pressed_bottom.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/tab_right_arrow.png b/res/drawable-hdpi-finger/tab_right_arrow.png
new file mode 100644
index 0000000..8a847e0
--- /dev/null
+++ b/res/drawable-hdpi-finger/tab_right_arrow.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/tab_selected.9.png b/res/drawable-hdpi-finger/tab_selected.9.png
new file mode 100644
index 0000000..08a39ff
--- /dev/null
+++ b/res/drawable-hdpi-finger/tab_selected.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_divider_res.9.png b/res/drawable-hdpi-finger/tab_selected_bottom.9.png
similarity index 65%
rename from res/drawable-finger/tab_divider_res.9.png
rename to res/drawable-hdpi-finger/tab_selected_bottom.9.png
index 3fdc372..3cc26bc 100644
--- a/res/drawable-finger/tab_divider_res.9.png
+++ b/res/drawable-hdpi-finger/tab_selected_bottom.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/tab_unselected.9.png b/res/drawable-hdpi-finger/tab_unselected.9.png
new file mode 100644
index 0000000..6150b5b
--- /dev/null
+++ b/res/drawable-hdpi-finger/tab_unselected.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/divider_vertical_dark.9.png b/res/drawable-mdpi-finger/divider_vertical_dark.9.png
new file mode 100644
index 0000000..30a68d0
--- /dev/null
+++ b/res/drawable-mdpi-finger/divider_vertical_dark.9.png
Binary files differ
diff --git a/res/drawable-finger/ic_tab_selected_dialer.png b/res/drawable-mdpi-finger/ic_tab_selected_dialer.png
similarity index 100%
rename from res/drawable-finger/ic_tab_selected_dialer.png
rename to res/drawable-mdpi-finger/ic_tab_selected_dialer.png
Binary files differ
diff --git a/res/drawable-finger/ic_tab_unselected_dialer.png b/res/drawable-mdpi-finger/ic_tab_unselected_dialer.png
similarity index 100%
rename from res/drawable-finger/ic_tab_unselected_dialer.png
rename to res/drawable-mdpi-finger/ic_tab_unselected_dialer.png
Binary files differ
diff --git a/res/drawable-finger/tab_focused.9.png b/res/drawable-mdpi-finger/tab_focused.9.png
similarity index 100%
rename from res/drawable-finger/tab_focused.9.png
rename to res/drawable-mdpi-finger/tab_focused.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_focused_bottom.9.png b/res/drawable-mdpi-finger/tab_focused_bottom.9.png
similarity index 100%
rename from res/drawable-finger/tab_focused_bottom.9.png
rename to res/drawable-mdpi-finger/tab_focused_bottom.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_left_arrow.png b/res/drawable-mdpi-finger/tab_left_arrow.png
similarity index 100%
rename from res/drawable-finger/tab_left_arrow.png
rename to res/drawable-mdpi-finger/tab_left_arrow.png
Binary files differ
diff --git a/res/drawable-finger/tab_pressed.9.png b/res/drawable-mdpi-finger/tab_pressed.9.png
similarity index 100%
rename from res/drawable-finger/tab_pressed.9.png
rename to res/drawable-mdpi-finger/tab_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_pressed_bottom.9.png b/res/drawable-mdpi-finger/tab_pressed_bottom.9.png
similarity index 100%
rename from res/drawable-finger/tab_pressed_bottom.9.png
rename to res/drawable-mdpi-finger/tab_pressed_bottom.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_right_arrow.png b/res/drawable-mdpi-finger/tab_right_arrow.png
similarity index 100%
rename from res/drawable-finger/tab_right_arrow.png
rename to res/drawable-mdpi-finger/tab_right_arrow.png
Binary files differ
diff --git a/res/drawable-finger/tab_selected.9.png b/res/drawable-mdpi-finger/tab_selected.9.png
similarity index 100%
rename from res/drawable-finger/tab_selected.9.png
rename to res/drawable-mdpi-finger/tab_selected.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_selected_bottom.9.png b/res/drawable-mdpi-finger/tab_selected_bottom.9.png
similarity index 100%
rename from res/drawable-finger/tab_selected_bottom.9.png
rename to res/drawable-mdpi-finger/tab_selected_bottom.9.png
Binary files differ
diff --git a/res/drawable-finger/tab_unselected.9.png b/res/drawable-mdpi-finger/tab_unselected.9.png
similarity index 100%
rename from res/drawable-finger/tab_unselected.9.png
rename to res/drawable-mdpi-finger/tab_unselected.9.png
Binary files differ
diff --git a/res/drawable/bg_stream.png b/res/drawable/bg_stream.png
deleted file mode 100644
index 0cec313..0000000
--- a/res/drawable/bg_stream.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/bubble_stream.9.png b/res/drawable/bubble_stream.9.png
deleted file mode 100644
index 8a34d52..0000000
--- a/res/drawable/bubble_stream.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/bubble_stream_dither.xml b/res/drawable/bubble_stream_dither.xml
deleted file mode 100644
index 1b5310e..0000000
--- a/res/drawable/bubble_stream_dither.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/bubble_stream"
- android:dither="true"
-/>
diff --git a/res/drawable/stream_bot.png b/res/drawable/stream_bot.png
deleted file mode 100644
index cea0eb3..0000000
--- a/res/drawable/stream_bot.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-finger/all_tab_indicator.xml b/res/layout-finger/all_tab_indicator.xml
index c8a4c44..25294c4 100644
--- a/res/layout-finger/all_tab_indicator.xml
+++ b/res/layout-finger/all_tab_indicator.xml
@@ -18,8 +18,8 @@
android:layout_width="wrap_content"
android:layout_height="40dip"
android:layout_weight="1"
- android:layout_marginLeft="-4dip"
- android:layout_marginRight="-4dip"
+ android:layout_marginLeft="-3dip"
+ android:layout_marginRight="-3dip"
android:minWidth="72dip"
android:background="@+drawable/tab_indicator_bg">
diff --git a/res/layout-finger/list_item_text_icons.xml b/res/layout-finger/list_item_text_icons.xml
index c551740..051dde9 100644
--- a/res/layout-finger/list_item_text_icons.xml
+++ b/res/layout-finger/list_item_text_icons.xml
@@ -92,13 +92,12 @@
/>
<ImageView android:id="@+id/secondary_action_button"
- android:layout_width="50dip"
- android:layout_height="50dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginRight="7dip"
android:gravity="center"
android:scaleType="centerInside"
- android:background="@drawable/list_item_secondary_button"
/>
</LinearLayout>
diff --git a/res/layout-finger/social_list.xml b/res/layout-finger/social_list.xml
deleted file mode 100644
index 28ff590..0000000
--- a/res/layout-finger/social_list.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:contacts="http://schemas.android.com/apk/res/com.android.contacts"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical">
-
- <com.android.contacts.EdgeTriggerView
- android:id="@+id/edge_trigger"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- contacts:edgeWidth="80dip"
- contacts:listenEdges="left">
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:fastScrollEnabled="true"
- android:divider="#0000"
- android:dividerHeight="0dip"
- />
-
- </com.android.contacts.EdgeTriggerView>
-
- <ScrollView
- android:id="@android:id/empty"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:fillViewport="true">
-
- <TextView
- android:id="@+id/emptyText"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/noContacts"
- android:textSize="20sp"
- android:textColor="?android:attr/textColorSecondary"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingTop="10dip"
- android:lineSpacingMultiplier="0.92" />
-
- </ScrollView>
-
-</LinearLayout>
diff --git a/res/layout-finger/social_list_item.xml b/res/layout-finger/social_list_item.xml
deleted file mode 100644
index ab4eddf..0000000
--- a/res/layout-finger/social_list_item.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
->
-
- <View
- android:id="@+id/divider"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
-
- android:background="?android:attr/listDivider"
- />
-
- <ImageView
- android:id="@+id/sourceIcon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:layout_marginTop="15dip"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="8dip"
-
- android:gravity="center"
- android:scaleType="centerInside"
- />
-
- <ImageView
- android:id="@+id/photo"
- android:layout_width="54dip"
- android:layout_height="54dip"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:layout_marginTop="1dip"
- android:layout_marginRight="8dip"
-
- android:background="@drawable/social_picture_border_in_list"
- android:cropToPadding="true"
- android:gravity="center"
- android:padding="5dip"
- android:scaleType="fitCenter"
- />
-
- <LinearLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/photo"
- android:layout_toLeftOf="@id/sourceIcon"
- android:paddingTop="5dip"
- android:paddingBottom="5dip"
- android:orientation="vertical"
- >
-
- <TextView
- android:id="@+id/content"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
-
- android:maxLines="6"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary"
- />
-
- <TextView
- android:id="@+id/summary"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
-
- android:paddingLeft="20dip"
- android:paddingBottom="5dip"
- android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#38F"
- />
-
- <ImageView
- android:id="@+id/thumbnail"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
-
- android:maxHeight="54dip"
- android:maxWidth="100dip"
- android:scaleType="fitStart"
- />
-
- <TextView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
-
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- android:textSize="12sp"
- />
- </LinearLayout>
-
-</RelativeLayout>
diff --git a/res/layout-finger/social_list_item_reply.xml b/res/layout-finger/social_list_item_reply.xml
deleted file mode 100644
index b7c06a0..0000000
--- a/res/layout-finger/social_list_item_reply.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingBottom="5dip"
->
-
- <ImageView
- android:id="@+id/photo"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:layout_marginTop="15dip"
- android:layout_marginLeft="50dip"
-
- android:background="@drawable/social_picture_border_in_list"
- android:cropToPadding="true"
- android:gravity="center"
- android:padding="5dip"
- android:scaleType="fitCenter"
- />
-
- <LinearLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/photo"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="-6dip"
- android:layout_marginRight="5dip"
-
- android:paddingTop="8dip"
- android:paddingRight="8dip"
- android:paddingBottom="8dip"
- android:paddingLeft="18dip"
- android:orientation="vertical"
- android:background="@drawable/bubble_stream_dither"
- >
-
- <TextView
- android:id="@+id/content"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
-
- android:maxLines="6"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary"
- />
-
- <TextView
- android:id="@+id/summary"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
-
- android:paddingLeft="20dip"
- android:paddingBottom="5dip"
- android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#38F"
- />
-
- <ImageView
- android:id="@+id/thumbnail"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
-
- android:maxHeight="54dip"
- android:maxWidth="100dip"
- android:scaleType="fitStart"
- />
-
- <TextView
- android:id="@+id/published"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
-
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- android:textSize="12sp"
- />
- </LinearLayout>
-</RelativeLayout>
diff --git a/res/layout-finger/tab_divider.xml b/res/layout-finger/tab_divider.xml
deleted file mode 100644
index 8e0e65d..0000000
--- a/res/layout-finger/tab_divider.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:background="@drawable/tab_divider"/>
\ No newline at end of file
diff --git a/res/layout-finger/tab_indicator.xml b/res/layout-finger/tab_indicator.xml
index dad6031..1158eb0 100644
--- a/res/layout-finger/tab_indicator.xml
+++ b/res/layout-finger/tab_indicator.xml
@@ -18,8 +18,8 @@
android:layout_width="wrap_content"
android:layout_height="40dip"
android:layout_weight="1"
- android:layout_marginLeft="-4dip"
- android:layout_marginRight="-4dip"
+ android:layout_marginLeft="-3dip"
+ android:layout_marginRight="-3dip"
android:minWidth="72dip"
android:background="@+drawable/tab_indicator_bg">
diff --git a/src/com/android/contacts/SocialStreamActivity.java b/src/com/android/contacts/SocialStreamActivity.java
deleted file mode 100644
index 2d84df2..0000000
--- a/src/com/android/contacts/SocialStreamActivity.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts;
-
-import com.android.contacts.ui.FastTrackWindow;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.app.ListActivity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.Intents;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.CommonDataKinds.Photo;
-import android.provider.SocialContract.Activities;
-import android.text.SpannableStringBuilder;
-import android.text.format.DateUtils;
-import android.text.style.StyleSpan;
-import android.text.style.UnderlineSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Xml;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.CursorAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.RemoteViews;
-import android.widget.TextView;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-public class SocialStreamActivity extends ListActivity implements OnClickListener {
- private static final String TAG = "SocialStreamActivity";
-
- private static final String[] PROJ_ACTIVITIES = new String[] {
- Activities._ID,
- Activities.RES_PACKAGE,
- Activities.MIMETYPE,
- Activities.AUTHOR_CONTACT_ID,
- RawContacts.CONTACT_ID,
- Contacts.DISPLAY_NAME,
- Activities.PUBLISHED,
- Activities.TITLE,
- Activities.SUMMARY,
- Activities.THREAD_PUBLISHED,
- Activities.LINK,
- Activities.THUMBNAIL,
- };
-
- private static final int COL_ID = 0;
- private static final int COL_PACKAGE = 1;
- private static final int COL_MIMETYPE = 2;
- private static final int COL_AUTHOR_CONTACT_ID = 3;
- private static final int COL_AGGREGATE_ID = 4;
- private static final int COL_DISPLAY_NAME = 5;
- private static final int COL_PUBLISHED = 6;
- private static final int COL_TITLE = 7;
- private static final int COL_SUMMARY = 8;
- private static final int COL_THREAD_PUBLISHED = 9;
- private static final int COL_LINK = 10;
- private static final int COL_THUMBNAIL = 11;
-
- public static final int PHOTO_SIZE = 54;
- public static final int THUMBNAIL_SIZE = 54;
-
- private SocialAdapter mAdapter;
-
- private ListView mListView;
- private FastTrackWindow mFastTrack;
- private MappingCache mMappingCache;
-
- private ContactsCache mContactsCache;
-
- @Override
- protected void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- setContentView(R.layout.social_list);
-
- mContactsCache = new ContactsCache(this);
- mMappingCache = MappingCache.createAndFill(this);
-
- Cursor cursor = managedQuery(Activities.CONTENT_URI, PROJ_ACTIVITIES, null, null);
- mAdapter = new SocialAdapter(this, cursor, mContactsCache, mMappingCache);
- mAdapter.setPhotoListener(this);
-
- setListAdapter(mAdapter);
-
- mListView = getListView();
- mFastTrack = new FastTrackWindow(this);
- }
-
- /** {@inheritDoc} */
- public void onClick(View v) {
- // Clicked on photo, so show fast-track
- showFastTrack(v, (Long)v.getTag());
- }
-
- private int[] mLocation = new int[2];
- private Rect mRect = new Rect();
-
- private void showFastTrack(View anchor, long aggId) {
- Uri aggUri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, aggId);
-
- anchor.getLocationInWindow(mLocation);
- mRect.left = mLocation[0];
- mRect.top = mLocation[1];
- mRect.right = mRect.left + anchor.getWidth();
- mRect.bottom = mRect.top + anchor.getHeight();
-
- mFastTrack.dismiss();
- mFastTrack.show(aggUri, mRect, Intents.MODE_MEDIUM, null);
- }
-
- @Override
- public void onBackPressed() {
- if (mFastTrack.isShowing()) {
- // Back key dismisses fast-track when its visible
- mFastTrack.dismiss();
- } else {
- super.onBackPressed();
- }
- }
-
- @Override
- protected void onListItemClick(ListView l, View v, int position, long id) {
- Cursor cursor = (Cursor)getListAdapter().getItem(position);
-
- // TODO check mime type and if it is supported, launch the corresponding app
- String link = cursor.getString(COL_LINK);
- if (link == null) {
- return;
- }
- startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(link)));
- }
-
- /**
- * List adapter for social stream data queried from
- * {@link Activities#CONTENT_URI}.
- */
- private static class SocialAdapter extends CursorAdapter {
- private final Context mContext;
- private final LayoutInflater mInflater;
- private final ContactsCache mContactsCache;
- private final MappingCache mMappingCache;
- private final StyleSpan mTextStyleName;
- private final UnderlineSpan mTextStyleLink;
- private OnClickListener mPhotoListener;
- private SpannableStringBuilder mBuilder = new SpannableStringBuilder();
-
- public static final int TYPE_ACTIVITY = 0;
- public static final int TYPE_REPLY = 1;
-
- private static class SocialHolder {
- ImageView photo;
- ImageView sourceIcon;
- TextView content;
- TextView summary;
- ImageView thumbnail;
- TextView published;
- }
-
- public SocialAdapter(Context context, Cursor c, ContactsCache contactsCache,
- MappingCache mappingCache) {
- super(context, c, true);
- mContext = context;
- mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- mContactsCache = contactsCache;
- mMappingCache = mappingCache;
- mTextStyleName = new StyleSpan(android.graphics.Typeface.BOLD);
- mTextStyleLink = new UnderlineSpan();
- }
-
- public void setPhotoListener(OnClickListener listener) {
- mPhotoListener = listener;
- }
-
- @Override
- public int getViewTypeCount() {
- return 2;
- }
-
- @Override
- public int getItemViewType(int position) {
- Cursor cursor = (Cursor) getItem(position);
- return isReply(cursor) ? TYPE_ACTIVITY : TYPE_REPLY;
- }
-
- @Override
- public void bindView(View view, Context context, Cursor cursor) {
- SocialHolder holder = (SocialHolder)view.getTag();
-
- long aggId = cursor.getLong(COL_AGGREGATE_ID);
- long contactId = cursor.getLong(COL_AUTHOR_CONTACT_ID);
- String name = cursor.getString(COL_DISPLAY_NAME);
- String title = cursor.getString(COL_TITLE);
- String summary = cursor.getString(COL_SUMMARY);
- long published = cursor.getLong(COL_PUBLISHED);
- byte[] thumbnailBlob = cursor.getBlob(COL_THUMBNAIL);
-
- // TODO: trigger async query to find actual name and photo instead
- // of using this lazy caching mechanism
- Bitmap photo = mContactsCache.getPhoto(contactId);
- if (photo != null) {
- holder.photo.setImageBitmap(photo);
- } else {
- holder.photo.setImageResource(R.drawable.ic_contact_list_picture);
- }
- holder.photo.setTag(aggId);
-
- mBuilder.clear();
- mBuilder.append(name);
- mBuilder.append(" ");
- mBuilder.append(title);
- mBuilder.setSpan(mTextStyleName, 0, name.length(), 0);
- holder.content.setText(mBuilder);
-
- if (summary == null) {
- holder.summary.setVisibility(View.GONE);
- } else {
- mBuilder.clear();
- mBuilder.append(summary);
- mBuilder.setSpan(mTextStyleLink, 0, summary.length(), 0);
- holder.summary.setText(mBuilder);
- holder.summary.setVisibility(View.VISIBLE);
- }
-
- if (thumbnailBlob != null) {
- Bitmap thumbnail =
- BitmapFactory.decodeByteArray(thumbnailBlob, 0, thumbnailBlob.length);
- holder.thumbnail.setImageBitmap(thumbnail);
- holder.thumbnail.setVisibility(View.VISIBLE);
- } else {
- holder.thumbnail.setVisibility(View.GONE);
- }
-
- CharSequence relativePublished = DateUtils.getRelativeTimeSpanString(published,
- System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS);
- holder.published.setText(relativePublished);
-
- if (holder.sourceIcon != null) {
- String packageName = cursor.getString(COL_PACKAGE);
- String mimeType = cursor.getString(COL_MIMETYPE);
- Mapping mapping = mMappingCache.findMapping(packageName, mimeType);
- if (mapping != null && mapping.icon != null) {
- holder.sourceIcon.setImageBitmap(mapping.icon);
- } else {
- holder.sourceIcon.setImageDrawable(null);
- }
- }
- }
-
- @Override
- public View newView(Context context, Cursor cursor, ViewGroup parent) {
- View view = mInflater.inflate(
- isReply(cursor) ? R.layout.social_list_item_reply : R.layout.social_list_item,
- parent, false);
-
- SocialHolder holder = new SocialHolder();
- holder.photo = (ImageView) view.findViewById(R.id.photo);
- holder.sourceIcon = (ImageView) view.findViewById(R.id.sourceIcon);
- holder.content = (TextView) view.findViewById(R.id.content);
- holder.summary = (TextView) view.findViewById(R.id.summary);
- holder.thumbnail = (ImageView) view.findViewById(R.id.thumbnail);
- holder.published = (TextView) view.findViewById(R.id.published);
- view.setTag(holder);
-
- holder.photo.setOnClickListener(mPhotoListener);
-
- return view;
- }
-
- private boolean isReply(Cursor cursor) {
-
- /*
- * Comparing the message timestamp to the thread timestamp rather than checking the
- * in_reply_to field. The rationale for this approach is that in the case when the
- * original message to which the reply was posted is missing, we want to display
- * the message as if it was an original; otherwise it would appear to be a reply
- * to whatever message preceded it in the list. In the case when the original message
- * of the thread is missing, the two timestamps will be the same.
- */
- long published = cursor.getLong(COL_PUBLISHED);
- long threadPublished = cursor.getLong(COL_THREAD_PUBLISHED);
- return published != threadPublished;
- }
- }
-
- /**
- * Keep a cache that maps from {@link RawContacts#_ID} to {@link Photo#PHOTO}
- * values.
- */
- private static class ContactsCache {
- private static final String TAG = "ContactsCache";
-
- private static final String[] PROJ_DETAILS = new String[] {
- Data.MIMETYPE,
- Data.RAW_CONTACT_ID,
- Photo.PHOTO,
- };
-
- private static final int COL_MIMETYPE = 0;
- private static final int COL_RAW_CONTACT_ID = 1;
- private static final int COL_PHOTO = 2;
-
- private HashMap<Long, Bitmap> mPhoto = new HashMap<Long, Bitmap>();
-
- public ContactsCache(Context context) {
- Log.d(TAG, "building ContactsCache...");
-
- ContentResolver resolver = context.getContentResolver();
- Cursor cursor = resolver.query(Data.CONTENT_URI, PROJ_DETAILS,
- Data.MIMETYPE + "=?", new String[] { Photo.CONTENT_ITEM_TYPE }, null);
-
- while (cursor.moveToNext()) {
- long contactId = cursor.getLong(COL_RAW_CONTACT_ID);
- String mimeType = cursor.getString(COL_MIMETYPE);
- if (Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
- byte[] photoBlob = cursor.getBlob(COL_PHOTO);
- Bitmap photo = BitmapFactory.decodeByteArray(photoBlob, 0, photoBlob.length);
- photo = Utilities.createBitmapThumbnail(photo, context, PHOTO_SIZE);
-
- mPhoto.put(contactId, photo);
- }
- }
-
- cursor.close();
- Log.d(TAG, "done building ContactsCache");
- }
-
- public Bitmap getPhoto(long contactId) {
- return mPhoto.get(contactId);
- }
- }
-
- /**
- * Store a mapping from a package name and mime-type pair to a set of
- * {@link RemoteViews}, default icon, and column to use from the
- * {@link Data} table to use as a summary.
- *
- * @deprecated use {@link ContactsSource} instead
- */
- @Deprecated
- public static class Mapping {
- String packageName;
- String mimeType;
- String summaryColumn;
- String detailColumn;
- int remoteViewsRes;
- Bitmap icon;
-
- public Mapping() {
- }
-
- public Mapping(String packageName, String mimeType) {
- this.packageName = packageName;
- this.mimeType = mimeType;
- }
- }
-
- /**
- * Store a parsed <code>Mapping</code> object, which maps package and
- * mime-type combinations to {@link RemoteViews} XML resources, default
- * icons, and summary columns in the {@link Data} table.
- *
- * @deprecated use {@link Sources} instead
- */
- @Deprecated
- public static class MappingCache extends HashMap<String, Mapping> {
- private static final String TAG = "MappingCache";
-
- private static final String TAG_MAPPINGSET = "MappingSet";
- private static final String TAG_MAPPING = "Mapping";
-
- private static final String MAPPING_METADATA = "com.android.contacts.stylemap";
-
-
- /**
- * Only allow inflating through
- * {@link MappingCache#createAndFill(Context)}.
- */
- private MappingCache() {
- }
-
- /**
- * Add a {@link Mapping} instance to this cache, correctly using
- * {@link #generateKey(String, String)} when storing.
- */
- public void addMapping(Mapping mapping) {
- String hashKey = generateKey(mapping.packageName, mapping.mimeType);
- put(hashKey, mapping);
- }
-
- /**
- * Generate a key used internally for mapping a specific package name
- * and mime-type to a {@link Mapping}.
- */
- private String generateKey(String packageName, String mimeType) {
- return packageName + ";" + mimeType;
- }
-
- /**
- * Find matching mapping for requested package and mime-type. Returns
- * null if no mapping found.
- */
- public Mapping findMapping(String packageName, String mimeType) {
- // Search for common mapping first
- final String commonMapping = generateKey(CommonDataKinds.PACKAGE_COMMON, mimeType);
- if (containsKey(commonMapping)) {
- return get(commonMapping);
- }
-
- // Otherwise search for package-specific mapping
- final String specificMapping = generateKey(packageName, mimeType);
- return get(specificMapping);
- }
-
- /**
- * Create a new {@link MappingCache} object and fill by walking across
- * all packages to find those that provide mappings.
- */
- public static MappingCache createAndFill(Context context) {
- Log.d(TAG, "building mime-type mapping cache...");
- final PackageManager pm = context.getPackageManager();
- MappingCache building = new MappingCache();
- List<ApplicationInfo> installed = pm
- .getInstalledApplications(PackageManager.GET_META_DATA);
- for (ApplicationInfo info : installed) {
- if (info.metaData != null && info.metaData.containsKey(MAPPING_METADATA)) {
- try {
- // Found metadata, so clone into their context to
- // inflate reference
- Context theirContext = context.createPackageContext(info.packageName, 0);
- XmlPullParser mappingParser = info.loadXmlMetaData(pm, MAPPING_METADATA);
- building.inflateMappings(theirContext, info.uid, info.packageName,
- mappingParser);
- } catch (NameNotFoundException e) {
- Log.w(TAG, "Problem creating context for remote package", e);
- } catch (InflateException e) {
- Log.w(TAG, "Problem inflating MappingSet from remote package", e);
- }
- }
- }
- return building;
- }
-
- public static class InflateException extends Exception {
- public InflateException(String message) {
- super(message);
- }
-
- public InflateException(String message, Throwable throwable) {
- super(message, throwable);
- }
- }
-
- /**
- * Inflate a <code>MappingSet</code> from an XML resource, assuming the
- * given package name as the source.
- */
- public void inflateMappings(Context context, int uid, String packageName,
- XmlPullParser parser) throws InflateException {
- final AttributeSet attrs = Xml.asAttributeSet(parser);
- final Resources res = context.getResources();
-
- try {
- int type;
- while ((type = parser.next()) != XmlPullParser.START_TAG
- && type != XmlPullParser.END_DOCUMENT) {
- // Drain comments and whitespace
- }
-
- if (type != XmlPullParser.START_TAG) {
- throw new InflateException("No start tag found");
- }
-
- if (!TAG_MAPPINGSET.equals(parser.getName())) {
- throw new InflateException("Top level element must be MappingSet");
- }
-
- // Parse all children actions
- final int depth = parser.getDepth();
- while (((type = parser.next()) != XmlPullParser.END_TAG || parser.getDepth() > depth)
- && type != XmlPullParser.END_DOCUMENT) {
- if (type == XmlPullParser.END_TAG) {
- continue;
- }
-
- if (!TAG_MAPPING.equals(parser.getName())) {
- throw new InflateException("Expected Mapping tag");
- }
-
- // Parse kind, mime-type, and RemoteViews reference
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Mapping);
-
- Mapping mapping = new Mapping();
- mapping.packageName = packageName;
- mapping.mimeType = a.getString(R.styleable.Mapping_mimeType);
- mapping.summaryColumn = a.getString(R.styleable.Mapping_summaryColumn);
- mapping.detailColumn = a.getString(R.styleable.Mapping_detailColumn);
- mapping.remoteViewsRes = a.getResourceId(R.styleable.Mapping_remoteViews, -1);
-
- // Read and resize icon if provided
- int iconRes = a.getResourceId(R.styleable.Mapping_icon, -1);
- if (iconRes != -1) {
- mapping.icon = BitmapFactory.decodeResource(res, iconRes);
- }
-
- addMapping(mapping);
- Log.d(TAG, "Added mapping for packageName=" + mapping.packageName
- + ", mimetype=" + mapping.mimeType);
- }
- } catch (XmlPullParserException e) {
- throw new InflateException("Problem reading XML", e);
- } catch (IOException e) {
- throw new InflateException("Problem reading XML", e);
- }
- }
- }
-
- /**
- * Borrowed from Launcher for {@link Bitmap} resizing.
- */
- static final class Utilities {
- private static final Paint sPaint = new Paint();
- private static final Rect sBounds = new Rect();
- private static final Rect sOldBounds = new Rect();
- private static Canvas sCanvas = new Canvas();
-
- static {
- sCanvas.setDrawFilter(new PaintFlagsDrawFilter(Paint.DITHER_FLAG,
- Paint.FILTER_BITMAP_FLAG));
- }
-
- /**
- * Returns a Bitmap representing the thumbnail of the specified Bitmap.
- * The size of the thumbnail is defined by the dimension
- * android.R.dimen.launcher_application_icon_size. This method is not
- * thread-safe and should be invoked on the UI thread only.
- *
- * @param bitmap The bitmap to get a thumbnail of.
- * @param context The application's context.
- * @return A thumbnail for the specified bitmap or the bitmap itself if
- * the thumbnail could not be created.
- * @deprecated use {@link Bitmap#createScaledBitmap} instead.
- */
- @Deprecated
- static Bitmap createBitmapThumbnail(Bitmap bitmap, Context context, int size) {
- int width = size;
- int height = size;
-
- final int bitmapWidth = bitmap.getWidth();
- final int bitmapHeight = bitmap.getHeight();
-
- if (width > 0 && height > 0 && (width < bitmapWidth || height < bitmapHeight)) {
- final float ratio = (float)bitmapWidth / bitmapHeight;
-
- if (bitmapWidth > bitmapHeight) {
- height = (int)(width / ratio);
- } else if (bitmapHeight > bitmapWidth) {
- width = (int)(height * ratio);
- }
-
- final Bitmap.Config c = (width == size && height == size) ? bitmap.getConfig()
- : Bitmap.Config.ARGB_8888;
- final Bitmap thumb = Bitmap.createBitmap(size, size, c);
- final Canvas canvas = sCanvas;
- final Paint paint = sPaint;
- canvas.setBitmap(thumb);
- paint.setDither(false);
- paint.setFilterBitmap(true);
- sBounds.set((size - width) / 2, (size - height) / 2, width, height);
- sOldBounds.set(0, 0, bitmapWidth, bitmapHeight);
- canvas.drawBitmap(bitmap, sOldBounds, sBounds, paint);
- return thumb;
- }
-
- return bitmap;
- }
- }
-}
diff --git a/src/com/android/contacts/ui/FastTrackWindow.java b/src/com/android/contacts/ui/FastTrackWindow.java
index ba0d912..630ecc4 100644
--- a/src/com/android/contacts/ui/FastTrackWindow.java
+++ b/src/com/android/contacts/ui/FastTrackWindow.java
@@ -251,7 +251,6 @@
setHeaderText(R.id.name, R.string.fasttrack_missing_name);
setHeaderText(R.id.status, null);
- setHeaderText(R.id.published, null);
setHeaderImage(R.id.presence, null);
mHasValidSocial = false;
@@ -481,14 +480,10 @@
if (cursor == null || !cursor.moveToNext()) return;
final String status = cursor.getString(SocialQuery.TITLE);
- final long published = cursor.getLong(SocialQuery.PUBLISHED);
- final CharSequence relativePublished = DateUtils.getRelativeTimeSpanString(published,
- System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS);
mHasValidSocial = !TextUtils.isEmpty(status);
setHeaderText(R.id.status, status);
- setHeaderText(R.id.published, relativePublished);
}
/**
