Moved fast-track to real window, summarize multiple track icons.
Moved fast-track away from using a PopupWindow (which expected a View
to get the parent Window IBinder), and instead are using our own
Window. This allows us to set custom parameters like dimming and
catching touches outside of our window area.
Removed FloatyListView since the fast-track no longer follows
ListView scrolling--instead outside touches dismiss the fast-track.
Changed fast-track handling of actionable contact methods to
summarize duplicate methods into one icon. Future plan is to "fold
out" the fast-track to resolve between multiple methods. Also
added notion of text-messaging as a separate action on a Phone item.
To prepare for duplicate resolution, we added the notion of a summary
column (from the data table) to each Mapping. We display the resolved
value to the user when they need to pick between duplicates. Changed
Mapping resolution to check for "common" package names first so that
phone numbers owned by other packages are all shown correctly with
generic icon.
Fixed so that pressing back button will always dismiss the fast-track
dialog when shown. (It now behaves the same regardless of where it's
being shown.)
Added status, presence, and profile action to fast-track. Changed
social stream so that tapping photo triggers fast-track, instead of
only using gesture approach.
diff --git a/res/drawable-finger/ic_tab_friends.xml b/res/drawable-finger/ic_tab_friends.xml
new file mode 100644
index 0000000..58234ae
--- /dev/null
+++ b/res/drawable-finger/ic_tab_friends.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/ic_tab_selected_friends_list" />
+ <item android:drawable="@drawable/ic_tab_unselected_friends_list" />
+</selector>
+
diff --git a/res/drawable-finger/ic_tab_selected_friends_list.png b/res/drawable-finger/ic_tab_selected_friends_list.png
new file mode 100644
index 0000000..de2c4cc
--- /dev/null
+++ b/res/drawable-finger/ic_tab_selected_friends_list.png
Binary files differ
diff --git a/res/drawable-finger/ic_tab_unselected_friends_list.png b/res/drawable-finger/ic_tab_unselected_friends_list.png
new file mode 100644
index 0000000..80736e9
--- /dev/null
+++ b/res/drawable-finger/ic_tab_unselected_friends_list.png
Binary files differ
diff --git a/res/drawable/fasttrack.9.png b/res/drawable/fasttrack.9.png
index 878dd58..fa0b917 100644
--- a/res/drawable/fasttrack.9.png
+++ b/res/drawable/fasttrack.9.png
Binary files differ
diff --git a/res/drawable/ic_contacts_details.png b/res/drawable/ic_contacts_details.png
new file mode 100644
index 0000000..7e71b85
--- /dev/null
+++ b/res/drawable/ic_contacts_details.png
Binary files differ
diff --git a/res/layout-finger/fasttrack.xml b/res/layout-finger/fasttrack.xml
index cf6b3d0..14d1d46 100644
--- a/res/layout-finger/fasttrack.xml
+++ b/res/layout-finger/fasttrack.xml
@@ -21,27 +21,51 @@
<ImageView
android:id="@+id/photo"
- android:layout_width="32dip"
- android:layout_height="32dip"
+ android:layout_width="42dip"
+ android:layout_height="42dip"
android:layout_marginLeft="4dip"
android:layout_marginTop="4dip"
- android:visibility="gone" />
+ android:scaleType="fitCenter" />
+
+ <ImageView
+ android:id="@+id/presence"
+ android:layout_width="wrap_content"
+ android:layout_height="42dip"
+ android:layout_marginRight="8dip"
+ android:layout_marginTop="4dip"
+ android:layout_alignParentRight="true"
+ android:src="@android:drawable/presence_online"
+ android:scaleType="centerInside" />
<TextView
android:id="@+id/displayname"
android:layout_toRightOf="@id/photo"
+ android:layout_toLeftOf="@id/presence"
android:layout_alignTop="@id/photo"
- android:layout_alignBottom="@id/photo"
- android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dip"
android:paddingRight="8dip"
+ android:textColor="#f000"
android:textSize="18dip"
android:textStyle="bold" />
+ <TextView
+ android:id="@+id/status"
+ android:layout_toRightOf="@id/photo"
+ android:layout_toLeftOf="@id/presence"
+ android:layout_below="@id/displayname"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:textColor="#f000"
+ android:textSize="14dip" />
+
<HorizontalScrollView
- android:layout_below="@id/photo"
+ android:layout_below="@id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fadingEdgeLength="40dip"
diff --git a/res/layout-finger/fasttrack_item.xml b/res/layout-finger/fasttrack_item.xml
new file mode 100644
index 0000000..fa70e06
--- /dev/null
+++ b/res/layout-finger/fasttrack_item.xml
@@ -0,0 +1,22 @@
+<?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_width="42dip"
+ android:layout_height="42dip"
+ android:layout_marginLeft="4dip"
+ android:layout_marginTop="4dip"
+ android:scaleType="fitCenter" />
diff --git a/res/layout-finger/social_list.xml b/res/layout-finger/social_list.xml
index 54417f3..28ff590 100644
--- a/res/layout-finger/social_list.xml
+++ b/res/layout-finger/social_list.xml
@@ -28,7 +28,7 @@
contacts:edgeWidth="80dip"
contacts:listenEdges="left">
- <com.android.contacts.FloatyListView
+ <ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 08f02db..de35898 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,6 +23,8 @@
<attr name="remoteViews" format="reference" />
<!-- Icon that should be used to represent this data -->
<attr name="icon" format="reference" />
+ <!-- Column in data table to summarize this data -->
+ <attr name="summaryColumn" format="string" />
</declare-styleable>
<declare-styleable name="EdgeTriggerView">
@@ -33,5 +35,4 @@
</attr>
</declare-styleable>
-
</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index fb1fe41..8d85e21 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -17,4 +17,5 @@
<resources>
<!-- The EditText for entries in the EditContactActivity -->
<item type="id" name="data" />
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c202eda..0e64eaa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -35,4 +35,13 @@
<item name="android:windowContentOverlay">@null</item>
</style>
+ <style name="FastTrack">
+ <item name="android:windowFrame">@null</item>
+ <item name="android:windowBackground">@drawable/fasttrack</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <!-- TODO: create our own animation style in framework -->
+ <item name="android:windowAnimationStyle">@*android:style/Animation.ZoomButtons</item>
+ </style>
+
</resources>
