Implement new QuickContact design
- Also removes default-functionality
- Fixes the flicker when dismissing (Bug:5025418)
Change-Id: I46cf0fbdb2dcbf002612672e5e8f81a9b1ab6939
diff --git a/res/anim/quickcontact_above_enter.xml b/res/anim/quickcontact_above_enter.xml
deleted file mode 100644
index d86c98c..0000000
--- a/res/anim/quickcontact_above_enter.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <scale android:interpolator="@android:interpolator/decelerate_quint"
- android:fromXScale="1" android:toXScale="1.0"
- android:fromYScale="0.8" android:toYScale="1.0"
- android:pivotX="50%" android:pivotY="100%"
- android:duration="@android:integer/config_shortAnimTime" />
- <alpha android:interpolator="@android:interpolator/decelerate_cubic"
- android:fromAlpha="0.0" android:toAlpha="1.0"
- android:duration="@android:integer/config_shortAnimTime" />
-</set>
diff --git a/res/anim/quickcontact_above_exit.xml b/res/anim/quickcontact_above_exit.xml
deleted file mode 100644
index e8a16b4..0000000
--- a/res/anim/quickcontact_above_exit.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <scale android:interpolator="@android:interpolator/accelerate_quint"
- android:fromXScale="1.0" android:toXScale="1.0"
- android:fromYScale="1.0" android:toYScale=".8"
- android:pivotX="50%" android:pivotY="100%"
- android:duration="@android:integer/config_shortAnimTime" />
- <alpha android:interpolator="@android:interpolator/accelerate_cubic"
- android:fromAlpha="1.0" android:toAlpha="0"
- android:duration="@android:integer/config_shortAnimTime" />
-</set>
diff --git a/res/anim/quickcontact_below_enter.xml b/res/anim/quickcontact_below_enter.xml
deleted file mode 100644
index 39aa177..0000000
--- a/res/anim/quickcontact_below_enter.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <scale android:interpolator="@android:interpolator/decelerate_quint"
- android:fromXScale="1" android:toXScale="1.0"
- android:fromYScale="0.8" android:toYScale="1.0"
- android:pivotX="50%" android:pivotY="0%"
- android:duration="@android:integer/config_shortAnimTime" />
- <alpha android:interpolator="@android:interpolator/decelerate_cubic"
- android:fromAlpha="0.0" android:toAlpha="1.0"
- android:duration="@android:integer/config_shortAnimTime" />
-</set>
diff --git a/res/anim/quickcontact_below_exit.xml b/res/anim/quickcontact_below_exit.xml
deleted file mode 100644
index 8f70751..0000000
--- a/res/anim/quickcontact_below_exit.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
- <scale android:interpolator="@android:interpolator/accelerate_quint"
- android:fromXScale="1.0" android:toXScale="1.0"
- android:fromYScale="1.0" android:toYScale="0.8"
- android:pivotX="50%" android:pivotY="0%"
- android:duration="@android:integer/config_shortAnimTime" />
- <alpha android:interpolator="@android:interpolator/accelerate_cubic"
- android:fromAlpha="1.0" android:toAlpha="0"
- android:duration="@android:integer/config_shortAnimTime" />
-</set>
diff --git a/res/drawable-hdpi/ic_fav_quickcontact_holo_dark.png b/res/drawable-hdpi/ic_fav_quickcontact_holo_dark.png
new file mode 100644
index 0000000..06dc777
--- /dev/null
+++ b/res/drawable-hdpi/ic_fav_quickcontact_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_text_holo_dark.png b/res/drawable-hdpi/ic_text_holo_dark.png
new file mode 100644
index 0000000..1816201
--- /dev/null
+++ b/res/drawable-hdpi/ic_text_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/quickactions_arrowdown_left_holo_light.9.png b/res/drawable-hdpi/quickactions_arrowdown_left_holo_light.9.png
deleted file mode 100644
index b09016b..0000000
--- a/res/drawable-hdpi/quickactions_arrowdown_left_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickactions_arrowdown_middle_holo_light.9.png b/res/drawable-hdpi/quickactions_arrowdown_middle_holo_light.9.png
deleted file mode 100644
index 670d89f..0000000
--- a/res/drawable-hdpi/quickactions_arrowdown_middle_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickactions_arrowdown_right_holo_light.9.png b/res/drawable-hdpi/quickactions_arrowdown_right_holo_light.9.png
deleted file mode 100644
index 81f4859..0000000
--- a/res/drawable-hdpi/quickactions_arrowdown_right_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickactions_arrowup_left_holo_light.9.png b/res/drawable-hdpi/quickactions_arrowup_left_holo_light.9.png
deleted file mode 100644
index 99ad9e2..0000000
--- a/res/drawable-hdpi/quickactions_arrowup_left_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickactions_arrowup_middle_holo_light.9.png b/res/drawable-hdpi/quickactions_arrowup_middle_holo_light.9.png
deleted file mode 100644
index 500d820..0000000
--- a/res/drawable-hdpi/quickactions_arrowup_middle_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickactions_arrowup_right_holo_light.9.png b/res/drawable-hdpi/quickactions_arrowup_right_holo_light.9.png
deleted file mode 100644
index d99058b..0000000
--- a/res/drawable-hdpi/quickactions_arrowup_right_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/quickcon_background_texture.png b/res/drawable-hdpi/quickcon_background_texture.png
new file mode 100644
index 0000000..60bb6cc
--- /dev/null
+++ b/res/drawable-hdpi/quickcon_background_texture.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_fav_quickcontact_holo_dark.png b/res/drawable-mdpi/ic_fav_quickcontact_holo_dark.png
new file mode 100644
index 0000000..a089a67
--- /dev/null
+++ b/res/drawable-mdpi/ic_fav_quickcontact_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_text_holo_dark.png b/res/drawable-mdpi/ic_text_holo_dark.png
new file mode 100644
index 0000000..bbaa84f
--- /dev/null
+++ b/res/drawable-mdpi/ic_text_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_arrowdown_left_holo_light.9.png b/res/drawable-mdpi/quickactions_arrowdown_left_holo_light.9.png
deleted file mode 100644
index bd43850..0000000
--- a/res/drawable-mdpi/quickactions_arrowdown_left_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_arrowdown_middle_holo_light.9.png b/res/drawable-mdpi/quickactions_arrowdown_middle_holo_light.9.png
deleted file mode 100644
index c284dbb..0000000
--- a/res/drawable-mdpi/quickactions_arrowdown_middle_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_arrowdown_right_holo_light.9.png b/res/drawable-mdpi/quickactions_arrowdown_right_holo_light.9.png
deleted file mode 100644
index c057f71..0000000
--- a/res/drawable-mdpi/quickactions_arrowdown_right_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_arrowup_left_holo_light.9.png b/res/drawable-mdpi/quickactions_arrowup_left_holo_light.9.png
deleted file mode 100644
index 85d092f..0000000
--- a/res/drawable-mdpi/quickactions_arrowup_left_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_arrowup_middle_holo_light.9.png b/res/drawable-mdpi/quickactions_arrowup_middle_holo_light.9.png
deleted file mode 100644
index 828b718..0000000
--- a/res/drawable-mdpi/quickactions_arrowup_middle_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickactions_arrowup_right_holo_light.9.png b/res/drawable-mdpi/quickactions_arrowup_right_holo_light.9.png
deleted file mode 100644
index e4994b4..0000000
--- a/res/drawable-mdpi/quickactions_arrowup_right_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/quickcon_background_texture.png b/res/drawable-mdpi/quickcon_background_texture.png
new file mode 100644
index 0000000..86e1635
--- /dev/null
+++ b/res/drawable-mdpi/quickcon_background_texture.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_fav_quickcontact_holo_dark.png b/res/drawable-xhdpi/ic_fav_quickcontact_holo_dark.png
new file mode 100644
index 0000000..0384abc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_fav_quickcontact_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_text_holo_dark.png b/res/drawable-xhdpi/ic_text_holo_dark.png
new file mode 100644
index 0000000..8c697d9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_text_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/quickactions_arrowdown_left_holo_light.9.png b/res/drawable-xhdpi/quickactions_arrowdown_left_holo_light.9.png
deleted file mode 100644
index 12e2988..0000000
--- a/res/drawable-xhdpi/quickactions_arrowdown_left_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickactions_arrowdown_middle_holo_light.9.png b/res/drawable-xhdpi/quickactions_arrowdown_middle_holo_light.9.png
deleted file mode 100644
index bff78a4..0000000
--- a/res/drawable-xhdpi/quickactions_arrowdown_middle_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickactions_arrowdown_right_holo_light.9.png b/res/drawable-xhdpi/quickactions_arrowdown_right_holo_light.9.png
deleted file mode 100644
index 1ef7191..0000000
--- a/res/drawable-xhdpi/quickactions_arrowdown_right_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickactions_arrowup_left_holo_light.9.png b/res/drawable-xhdpi/quickactions_arrowup_left_holo_light.9.png
deleted file mode 100644
index cf280d9..0000000
--- a/res/drawable-xhdpi/quickactions_arrowup_left_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickactions_arrowup_middle_holo_light.9.png b/res/drawable-xhdpi/quickactions_arrowup_middle_holo_light.9.png
deleted file mode 100644
index b5d9a0d..0000000
--- a/res/drawable-xhdpi/quickactions_arrowup_middle_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickactions_arrowup_right_holo_light.9.png b/res/drawable-xhdpi/quickactions_arrowup_right_holo_light.9.png
deleted file mode 100644
index 6c6a99c..0000000
--- a/res/drawable-xhdpi/quickactions_arrowup_right_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/quickcon_background_texture.png b/res/drawable-xhdpi/quickcon_background_texture.png
new file mode 100644
index 0000000..9134f93
--- /dev/null
+++ b/res/drawable-xhdpi/quickcon_background_texture.png
Binary files differ
diff --git a/res/drawable/quickactions_arrow_left_holo_light.xml b/res/drawable/quickactions_arrow_left_holo_light.xml
deleted file mode 100644
index c1e18bd..0000000
--- a/res/drawable/quickactions_arrow_left_holo_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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_first="true" android:drawable="@drawable/quickactions_arrowdown_left_holo_light" />
- <item android:state_last="true" android:drawable="@drawable/quickactions_arrowup_left_holo_light" />
- <!-- TODO: provide callout-less state -->
- <item android:drawable="@drawable/quickactions_arrowup_left_holo_light" />
-</selector>
diff --git a/res/drawable/quickactions_arrow_middle_holo_light.xml b/res/drawable/quickactions_arrow_middle_holo_light.xml
deleted file mode 100644
index f88b513..0000000
--- a/res/drawable/quickactions_arrow_middle_holo_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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_first="true" android:drawable="@drawable/quickactions_arrowdown_middle_holo_light" />
- <item android:state_last="true" android:drawable="@drawable/quickactions_arrowup_middle_holo_light" />
- <!-- TODO: provide callout-less state -->
- <item android:drawable="@drawable/quickactions_arrowup_middle_holo_light" />
-</selector>
diff --git a/res/drawable/quickactions_arrow_right_holo_light.xml b/res/drawable/quickactions_arrow_right_holo_light.xml
deleted file mode 100644
index 3e309fe..0000000
--- a/res/drawable/quickactions_arrow_right_holo_light.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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_first="true" android:drawable="@drawable/quickactions_arrowdown_right_holo_light" />
- <item android:state_last="true" android:drawable="@drawable/quickactions_arrowup_right_holo_light" />
- <!-- TODO: provide callout-less state -->
- <item android:drawable="@drawable/quickactions_arrowup_right_holo_light" />
-</selector>
diff --git a/res/drawable/quickcontact_list_item_background.xml b/res/drawable/quickcontact_list_item_background.xml
new file mode 100644
index 0000000..e6d773e
--- /dev/null
+++ b/res/drawable/quickcontact_list_item_background.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<!-- TODO These all have to be refined -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_window_focused="false"
+ android:drawable="@drawable/list_background_holo" />
+ <item
+ android:state_focused="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_pressed_holo" />
+ <item
+ android:state_focused="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_pressed_holo" />
+ <item
+ android:state_focused="true"
+ android:drawable="@drawable/list_focused_holo" />
+ <item
+ android:drawable="@color/people_app_theme_color" />
+</selector>
diff --git a/res/drawable/quickcontact_slider_btn.xml b/res/drawable/quickcontact_slider_btn.xml
deleted file mode 100644
index b3d0ec7..0000000
--- a/res/drawable/quickcontact_slider_btn.xml
+++ /dev/null
@@ -1,30 +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"
- android:dither="true">
- <!-- TODO Still a hack. This needs a default from the framework instead for the checked state -->
- <item android:state_checked="true"
- android:drawable="@drawable/quickactions_icon_activated" />
- <item android:state_window_focused="false"
- android:drawable="@android:color/transparent" />
- <item android:state_pressed="true"
- android:drawable="@drawable/quickactions_icon_activated" />
- <item android:state_focused="true"
- android:drawable="@drawable/quickactions_icon_activated" />
- <item
- android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/layout/quickcontact_header_small.xml b/res/drawable/quickcontact_track_background.xml
similarity index 67%
rename from res/layout/quickcontact_header_small.xml
rename to res/drawable/quickcontact_track_background.xml
index f3a46d5..fcf61fd 100644
--- a/res/layout/quickcontact_header_small.xml
+++ b/res/drawable/quickcontact_track_background.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- Copyright (C) 2011 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.
@@ -14,9 +14,6 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/header_small"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" />
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/quickcon_background_texture"
+ android:tileMode="repeat" />
diff --git a/res/layout-finger/quickcontact_item_nodata.xml b/res/layout-finger/quickcontact_item_nodata.xml
deleted file mode 100644
index 5f951e2..0000000
--- a/res/layout-finger/quickcontact_item_nodata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="12dip"
- android:paddingRight="12dip"
- android:scaleType="centerInside"
- android:focusable="false"
- android:clickable="false"
- android:gravity="center_vertical"
- android:textColor="@android:color/black"
- android:text="@string/quickcontact_no_data" />
diff --git a/res/layout-sw580dp/quickcontact_activity.xml b/res/layout-sw580dp/quickcontact_activity.xml
new file mode 100644
index 0000000..6b381a9
--- /dev/null
+++ b/res/layout-sw580dp/quickcontact_activity.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<view
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ class="com.android.contacts.quickcontact.FloatingChildLayout"
+ android:id="@+id/floating_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:descendantFocusability="afterDescendants">
+ <LinearLayout
+ android:id="@android:id/content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <include layout="@layout/quickcontact_photo_container" />
+ <View
+ android:id="@+id/line_before_track"
+ android:layout_width="match_parent"
+ android:layout_height="2dip"
+ android:background="@color/quickcontact_list_background" />
+ <include layout="@layout/quickcontact_track" />
+ <android.support.v4.view.ViewPager
+ android:id="@+id/item_list_pager"
+ android:layout_width="match_parent"
+ android:layout_height="180dip" />
+ </LinearLayout>
+</view>
diff --git a/res/layout-w470dp/quickcontact_activity.xml b/res/layout-w470dp/quickcontact_activity.xml
new file mode 100644
index 0000000..df68761
--- /dev/null
+++ b/res/layout-w470dp/quickcontact_activity.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<view
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ class="com.android.contacts.quickcontact.FloatingChildLayout"
+ android:id="@+id/floating_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:descendantFocusability="afterDescendants">
+ <LinearLayout
+ android:id="@android:id/content"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/quick_contact_picture_height"
+ android:padding="32dip"
+ android:orientation="horizontal">
+ <include layout="@layout/quickcontact_photo_container" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/quick_contact_picture_height"
+ android:orientation="vertical">
+ <include layout="@layout/quickcontact_track" />
+ <android.support.v4.view.ViewPager
+ android:id="@+id/item_list_pager"
+ android:background="@color/quickcontact_list_background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </LinearLayout>
+ </LinearLayout>
+</view>
diff --git a/res/layout/quickcontact.xml b/res/layout/quickcontact.xml
deleted file mode 100644
index e2b291c..0000000
--- a/res/layout/quickcontact.xml
+++ /dev/null
@@ -1,136 +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.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/content"
- android:layout_width="@dimen/quick_contact_width"
- android:layout_height="wrap_content"
- android:visibility="invisible"
- android:orientation="vertical">
-
- <FrameLayout
- android:id="@+id/header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dip">
-
- <ViewStub
- android:id="@+id/header_small"
- android:inflatedId="@+id/header_small"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout="@layout/quickcontact_header_small" />
-
- <ViewStub
- android:id="@+id/header_medium"
- android:inflatedId="@+id/header_medium"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout="@layout/quickcontact_header_med" />
-
- <ViewStub
- android:id="@+id/header_large"
- android:inflatedId="@+id/header_large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout="@layout/quickcontact_header_large" />
-
- </FrameLayout>
-
- <HorizontalScrollView
- android:id="@+id/scroll"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dip"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="15dip"
- android:layout_marginBottom="10dip"
- android:fadingEdgeLength="0dip"
- android:scrollbars="none">
-
- <LinearLayout
- android:id="@+id/quickcontact"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal" />
- </HorizontalScrollView>
-
- <FrameLayout
- android:id="@+id/footer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone">
- <LinearLayout
- android:id="@+id/footer_disambig"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="gone">
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="5dip"
- android:cacheColorHint="@null" />
-
- <CheckBox
- android:id="@android:id/checkbox"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="19dip"
- android:layout_marginRight="19dip"
- android:minHeight="60dip"
- android:textColor="#f000"
- android:textStyle="bold"
- android:text="@string/quickcontact_remember_choice"
- android:textAppearance="?android:attr/textAppearanceSmallInverse" />
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/footer_clear_defaults"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="gone">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="5dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/quickcontact_clear_defaults_caption" />
- <ListView
- android:id="@+id/defaults_list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="5dip"
- android:cacheColorHint="@null" />
- <Button
- android:id="@+id/clear_defaults_button"
- android:layout_marginLeft="20dip"
- android:layout_marginBottom="20dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/quickcontact_clear_defaults_button" />
- </LinearLayout>
- </FrameLayout>
-</LinearLayout>
diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index aced4a8..7aa2aa4 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -22,7 +22,23 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="afterDescendants">
-
- <include layout="@layout/quickcontact" />
-
+ <LinearLayout
+ android:id="@android:id/content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
+ android:orientation="vertical">
+ <include layout="@layout/quickcontact_photo_container" />
+ <View
+ android:id="@+id/line_before_track"
+ android:layout_width="match_parent"
+ android:layout_height="2dip"
+ android:background="@color/quickcontact_list_background" />
+ <include layout="@layout/quickcontact_track" />
+ <android.support.v4.view.ViewPager
+ android:id="@+id/item_list_pager"
+ android:layout_width="match_parent"
+ android:layout_height="180dip" />
+ </LinearLayout>
</view>
diff --git a/res/layout/quickcontact_default_item.xml b/res/layout/quickcontact_default_item.xml
deleted file mode 100755
index 3a918f0..0000000
--- a/res/layout/quickcontact_default_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="25dip"
- android:paddingRight="25dip"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical">
-
- <TextView
- android:id="@android:id/text1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@android:id/text2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="-4dip"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
-</LinearLayout>
diff --git a/res/layout/quickcontact_header_large.xml b/res/layout/quickcontact_header_large.xml
deleted file mode 100644
index b8a19cf..0000000
--- a/res/layout/quickcontact_header_large.xml
+++ /dev/null
@@ -1,79 +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.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/header_large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="87dip"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/photo"
- android:layout_width="64dip"
- android:layout_height="64dip"
- android:layout_marginLeft="15dip" />
-
- <LinearLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginLeft="15dip"
- android:paddingRight="8dip"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textColor="@*android:color/primary_text_light"
- android:textStyle="bold"
- android:textSize="18dip" />
-
- <TextView
- android:id="@+id/status"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textColor="@*android:color/secondary_text_light"
- android:textSize="15dip"
- android:layout_marginTop="-3dip" />
-
- <TextView
- android:id="@+id/timestamp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textColor="@*android:color/secondary_text_light"
- android:textSize="12dip"
- android:layout_marginTop="-2dip" />
-
- </LinearLayout>
-
- <ImageView
- android:id="@+id/presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="15dip"
- android:scaleType="centerInside" />
-
-</LinearLayout>
diff --git a/res/layout/quickcontact_header_med.xml b/res/layout/quickcontact_header_med.xml
deleted file mode 100644
index 77cb1a5..0000000
--- a/res/layout/quickcontact_header_med.xml
+++ /dev/null
@@ -1,55 +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.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/header_medium"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="51dip"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
- <LinearLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="15dip"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/status"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textColor="@*android:color/primary_text_light"
- android:textSize="15sp" />
-
- <TextView
- android:id="@+id/timestamp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- android:textColor="@*android:color/secondary_text_light"
- android:textSize="12sp"
- android:layout_marginTop="-2dip" />
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/quickcontact_list_fragment.xml b/res/layout/quickcontact_list_fragment.xml
new file mode 100755
index 0000000..8c62c4c
--- /dev/null
+++ b/res/layout/quickcontact_list_fragment.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <!-- Line that looks like a list divider -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="@color/quickcontact_list_divider" />
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:divider="@color/quickcontact_list_divider"
+ android:dividerHeight="1dip"
+ android:background="@color/quickcontact_list_background"
+ android:cacheColorHint="@null" />
+</LinearLayout>
diff --git a/res/layout/quickcontact_list_item.xml b/res/layout/quickcontact_list_item.xml
new file mode 100755
index 0000000..f77ed3f
--- /dev/null
+++ b/res/layout/quickcontact_list_item.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="@drawable/quickcontact_list_item_background"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:gravity="center_vertical">
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:gravity="center_vertical">
+ <TextView
+ android:id="@android:id/text1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/white"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ <TextView
+ android:id="@android:id/text2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/white"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+ </LinearLayout>
+ <View
+ android:id="@+id/vertical_divider"
+ android:layout_width="1dip"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:background="@drawable/ic_divider_dashed_holo_dark" />
+ <ImageView
+ android:id="@+id/secondary_action_button"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/detail_item_icon_margin"
+ android:paddingRight="@dimen/detail_item_icon_margin"
+ android:background="@drawable/quickcontact_list_item_background"
+ android:duplicateParentState="false" />
+</LinearLayout>
diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml
new file mode 100644
index 0000000..3e0c935
--- /dev/null
+++ b/res/layout/quickcontact_photo_container.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<merge
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <RelativeLayout
+ android:id="@+id/photo_container"
+ android:layout_width="@dimen/quick_contact_picture_width"
+ android:layout_height="@dimen/quick_contact_picture_height"
+ android:gravity="center_vertical">
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:scaleType="centerCrop" />
+ <View
+ android:id="@+id/photo_text_bar"
+ android:layout_width="0dip"
+ android:layout_height="42dip"
+ android:layout_alignBottom="@id/photo"
+ android:layout_alignLeft="@id/photo"
+ android:layout_alignRight="@id/photo"
+ android:alpha="0.5"
+ android:background="@android:color/black" />
+ <ImageButton
+ android:id="@+id/open_details_button"
+ android:src="@drawable/ic_fav_quickcontact_holo_dark"
+ android:background="?android:attr/selectableItemBackground"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginRight="16dip"
+ android:layout_marginBottom="5dip"
+ android:layout_alignBottom="@id/photo_text_bar"
+ android:layout_alignRight="@id/photo_text_bar" />
+ <TextView
+ android:id="@+id/name"
+ android:layout_width="wrap_content"
+ android:layout_height="42dip"
+ android:layout_alignBottom="@id/photo"
+ android:layout_alignLeft="@id/photo"
+ android:layout_toLeftOf="@id/open_details_button"
+ android:gravity="center_vertical"
+ android:paddingLeft="8dip"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textColor="@android:color/white"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ <TextView
+ android:id="@+id/status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textColor="@*android:color/secondary_text_light"
+ android:textSize="15dip"
+ android:layout_marginTop="-3dip" />
+ <TextView
+ android:id="@+id/timestamp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textColor="@*android:color/secondary_text_light"
+ android:textSize="12dip"
+ android:layout_marginTop="-2dip" />
+ <ImageView
+ android:id="@+id/presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="15dip"
+ android:scaleType="centerInside" />
+ <ImageButton
+ android:id="@+id/open_details_push_layer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:attr/selectableItemBackground" />
+ </RelativeLayout>
+</merge>
diff --git a/res/layout/quickcontact_resolve_item.xml b/res/layout/quickcontact_resolve_item.xml
deleted file mode 100755
index 2805722..0000000
--- a/res/layout/quickcontact_resolve_item.xml
+++ /dev/null
@@ -1,40 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="25dip"
- android:paddingRight="25dip"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical">
-
- <TextView
- android:id="@android:id/text1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@android:id/text2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="-4dip"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
-</LinearLayout>
diff --git a/res/layout/quickcontact_track.xml b/res/layout/quickcontact_track.xml
new file mode 100644
index 0000000..8177174
--- /dev/null
+++ b/res/layout/quickcontact_track.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<merge
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <HorizontalScrollView
+ android:id="@+id/track_scroller"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fadingEdgeLength="0dip"
+ android:background="@drawable/quickcontact_track_background"
+ android:scrollbars="none">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:id="@+id/track"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" />
+ <View
+ android:id="@+id/selected_tab_rectangle"
+ android:layout_width="60dip"
+ android:layout_height="8dip"
+ android:layout_alignBottom="@id/track"
+ android:layout_alignParentLeft="true"
+ android:background="@color/quickcontact_list_background" />
+ </RelativeLayout>
+ </HorizontalScrollView>
+</merge>
diff --git a/res/layout/quickcontact_item.xml b/res/layout/quickcontact_track_button.xml
similarity index 87%
rename from res/layout/quickcontact_item.xml
rename to res/layout/quickcontact_track_button.xml
index ca57d66..f1353f2 100644
--- a/res/layout/quickcontact_item.xml
+++ b/res/layout/quickcontact_track_button.xml
@@ -4,9 +4,9 @@
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.
@@ -16,8 +16,8 @@
<com.android.contacts.quickcontact.CheckableImageView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="59dip"
- android:layout_height="51dip"
+ android:layout_width="60dip"
+ android:layout_height="60dip"
android:paddingLeft="12dip"
android:paddingRight="12dip"
android:paddingTop="8dip"
@@ -25,4 +25,4 @@
android:scaleType="centerInside"
android:focusable="true"
android:clickable="true"
- android:background="@drawable/quickcontact_slider_btn" />
+ android:background="?android:attr/selectableItemBackground" />
diff --git a/res/values-sw580dp-w1000dp/dimens.xml b/res/values-sw580dp-w1000dp/dimens.xml
index ac30b76..7ff9026 100644
--- a/res/values-sw580dp-w1000dp/dimens.xml
+++ b/res/values-sw580dp-w1000dp/dimens.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<resources>
- <dimen name="quick_contact_width">452dip</dimen>
<dimen name="action_bar_filter_min_width">220dip</dimen>
<dimen name="action_bar_filter_max_width">300dip</dimen>
<dimen name="action_bar_search_max_width">336dip</dimen>
diff --git a/res/values-sw580dp/dimens.xml b/res/values-sw580dp/dimens.xml
index 9fbdc8e..60da57a 100644
--- a/res/values-sw580dp/dimens.xml
+++ b/res/values-sw580dp/dimens.xml
@@ -23,7 +23,6 @@
<dimen name="editor_field_top_padding">12dip</dimen>
<dimen name="editor_field_bottom_padding">12dip</dimen>
<dimen name="detail_item_side_margin">19dip</dimen>
- <dimen name="quick_contact_width">356dip</dimen>
<dimen name="contact_name_text_size">26sp</dimen>
<dimen name="action_bar_filter_min_width">120dip</dimen>
<dimen name="action_bar_filter_max_width">120dip</dimen>
@@ -37,4 +36,7 @@
<dimen name="search_view_width">400dip</dimen>
<dimen name="contact_browser_list_left_margin">0dip</dimen>
<dimen name="contacts_count_right_margin">24dip</dimen>
+ <dimen name="quick_contact_top_position">-1px</dimen>
+ <dimen name="quick_contact_picture_width">400dip</dimen>
+ <dimen name="quick_contact_picture_height">200dip</dimen>
</resources>
diff --git a/res/values-w470dp/dimens.xml b/res/values-w470dp/dimens.xml
index ba7f3f8..c77d8c2 100644
--- a/res/values-w470dp/dimens.xml
+++ b/res/values-w470dp/dimens.xml
@@ -15,4 +15,7 @@
-->
<resources>
<dimen name="detail_tab_carousel_height">0dip</dimen>
+ <dimen name="quick_contact_top_position">-1px</dimen>
+ <dimen name="quick_contact_picture_width">174dip</dimen>
+ <dimen name="quick_contact_picture_height">-1px</dimen>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 579bf84..325d2e7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,8 +17,8 @@
<color name="textColorIconOverlay">#fff</color>
<color name="textColorIconOverlayShadow">#000</color>
- <color name="quickcontact_disambig">#f2f2f2</color>
- <color name="quickcontact_disambig_divider">#afafaf</color>
+ <color name="quickcontact_list_divider">#ff48bde8</color>
+ <color name="quickcontact_list_background">#ff33b5e6</color>
<color name="edit_divider">#ff666666</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2b71c84..45aa75e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -30,10 +30,17 @@
<dimen name="photo_action_popup_width">400dip</dimen>
- <!-- Width of the quick contact popup. This size is chosen so that the last icon is clipped
- to indicate horizontal scrollability. Also, this size is the same as the widget to make them
- aligned -->
- <dimen name="quick_contact_width">352dip</dimen>
+ <!-- Top position of quick contact. If this is -1, the vertical position is determined
+ based on the source of the request -->
+ <dimen name="quick_contact_top_position">48dip</dimen>
+
+ <!-- Width of the picture in the QuickContact popup. This can be -1 for the full width
+ of the parent -->
+ <dimen name="quick_contact_picture_width">-1px</dimen>
+
+ <!-- Height of the picture in the QuickContact popup. This can be -1 for the full height
+ of the parent -->
+ <dimen name="quick_contact_picture_height">174dip</dimen>
<!-- Padding of the rounded plus/minus/expand/collapse buttons in the editor -->
<dimen name="editor_round_button_padding_left">2dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0fbc6bf..20326ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1015,32 +1015,13 @@
<!-- Message next to disamgiguation dialog check box -->
<string name="make_primary">Remember this choice</string>
- <!-- Shown as a toast when the user taps on a Fast-Track icon, and no application
+ <!-- Shown as a toast when the user taps on a QuickContact icon, and no application
was found that could perform the selected action -->
<string name="quickcontact_missing_app">No application found to handle this action</string>
- <!-- Shown as the checkbox label that, when checked, will store remember the
- selected choice and shortcut to it in the future. For example, this would
- make a selected phone number the default. -->
- <string name="quickcontact_remember_choice">Remember this choice</string>
-
<!-- Shown as the header name for a person when the name is missing or unknown. -->
<string name="quickcontact_missing_name">Unknown</string>
- <!-- Text that is shown in the Badge, when there is no data to display -->
- <string name="quickcontact_no_data">No data</string>
-
- <!-- Accessibility description for the button in QuickContacts that allows the user to clear
- defaults of a contact (like primary email). [CHAR LIMIT=100] -->
- <string name="quickcontact_clear_defaults_description">Clear defaults</string>
-
- <!-- Caption that shows above the list of defaults (like primary email). [CHAR LIMIT=40] -->
- <string name="quickcontact_clear_defaults_caption">Defaults set for this contact:</string>
-
- <!-- Button caption that allows the user to clear the defaults (like primary email) of one
- contact. [CHAR LIMIT=15] -->
- <string name="quickcontact_clear_defaults_button">Clear</string>
-
<!-- The menu item to open the list of accounts -->
<string name="menu_accounts">Accounts</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f32ae4c..b58706e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -97,7 +97,7 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@null</item>
<item name="android:windowIsFloating">false</item>
- <item name="android:backgroundDimEnabled">false</item>
+ <item name="android:backgroundDimEnabled">true</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
</style>
