commit 8d7f706c591734420cc75e8f16e632edd6a78736
author Android (Google) Code Review <android-gerrit@google.com> Thu May 21 16:28:45 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 21 16:28:45 2009 -0700
tree d5358f0cbba69c5882f8078d1ccae39a85116eaa
parent 7f805bf4e8edb92f9132236f7c0023fbf31182fe
parent 9bd858bdf35a854b22b2602bfbbf09a7b9edec18

Merge change 2257 into eclair-dev

* changes:
  Moved fast-track to real window, summarize multiple track icons.

res/layout-finger/fasttrack.xml

diff --git a/res/layout-finger/fasttrack.xml b/res/layout-finger/fasttrack.xml
index daf742b..c7efac8 100644
--- a/res/layout-finger/fasttrack.xml
+++ b/res/layout-finger/fasttrack.xml
@@ -40,24 +40,41 @@
             android:layout_height="40dip"
             android:layout_marginLeft="4dip"
             android:background="@drawable/frame_sm_track"
-            android:scaleType="fitCenter" />
+        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" />
 
         <LinearLayout
             android:layout_width="0dip"
+        android:layout_toLeftOf="@id/presence"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:paddingLeft="8dip"
             android:paddingRight="8dip"
-            android:orientation="vertical">
+        android:textColor="#f000"
 
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:ellipsize="end"
-                android:textColor="#f666"
-                android:textSize="14dip" />
+
+    <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" />
 
             <TextView
                 android:id="@+id/published"
@@ -79,9 +96,8 @@
             android:scaleType="centerInside" />
 
     </LinearLayout>
-
     <HorizontalScrollView
-        android:layout_below="@id/header"
+        android:layout_below="@id/status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fadingEdgeLength="40dip"

src/com/android/contacts/FastTrackWindow.java

diff --git a/src/com/android/contacts/FastTrackWindow.java b/src/com/android/contacts/FastTrackWindow.java
index a97c7f7..1252086 100644
--- a/src/com/android/contacts/FastTrackWindow.java
+++ b/src/com/android/contacts/FastTrackWindow.java
@@ -159,6 +159,9 @@
         Email.CONTENT_ITEM_TYPE,
     };
 
+//    public static final int ICON_SIZE = 42;
+//    public static final int ICON_PADDING = 3;
+
     // TODO: read this status from actual query
     private static final String STUB_STATUS = "has a really long random status message that would be far too long to read on a single device without the need for tiny reading glasses";
 

src/com/android/contacts/SocialStreamActivity.java

diff --git a/src/com/android/contacts/SocialStreamActivity.java b/src/com/android/contacts/SocialStreamActivity.java
index b4ca8bb..888748b 100644
--- a/src/com/android/contacts/SocialStreamActivity.java
+++ b/src/com/android/contacts/SocialStreamActivity.java
@@ -202,7 +202,6 @@
         if (link == null) {
             return;
         }
-
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(link)));
     }
 
@@ -224,7 +223,6 @@
             ImageView photo;
             ImageView sourceIcon;
             TextView content;
-            SpannableStringBuilder contentBuilder = new SpannableStringBuilder();
             TextView summary;
             SpannableStringBuilder summaryBuilder = new SpannableStringBuilder();
             ImageView thumbnail;