Iteration on fast-track to show better data and disambig.
Finished up code that allows for disambiguation between
multiple contact methods under same mime-type. Per design,
the fast-track window expands to show all choices when there
are multiple available. For example, it shows a list
between "Home", "Work" and "Mobile" if an aggregate has
three phone numbers. Back key will first dismiss the
disambig list if shown, before dismissing the dialog.
Moved fast-track to use Rect target areas to be more
flexible, instead of splitting up into multiple variables.
Correctly measure the fast-track window now, instead of
relying on hard-coded constants. Now using the new query
path provided by SocialContract to provide single-line
social summary for a given aggregate, instead of using
hard-coded social string.
Added a third data query to pull display name for aggregate
along with most-present presence from provider. Changed
fast-track to make chicklets focusable for dpad navigation.
diff --git a/res/drawable-finger/bg_chicklit.xml b/res/drawable-finger/bg_chicklit.xml
new file mode 100644
index 0000000..57d5275
--- /dev/null
+++ b/res/drawable-finger/bg_chicklit.xml
@@ -0,0 +1,26 @@
+<?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_window_focused="false"
+ android:drawable="@drawable/bg_chicklit_normal" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/bg_chicklit_pressed" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/bg_chicklit_focused" />
+ <item
+ android:drawable="@drawable/bg_chicklit_normal" />
+</selector>
diff --git a/res/drawable-finger/bg_chicklit_focused.9.png b/res/drawable-finger/bg_chicklit_focused.9.png
new file mode 100644
index 0000000..f6b4240
--- /dev/null
+++ b/res/drawable-finger/bg_chicklit_focused.9.png
Binary files differ
diff --git a/res/drawable-finger/chicklit_bg2.9.png b/res/drawable-finger/bg_chicklit_normal.9.png
similarity index 100%
rename from res/drawable-finger/chicklit_bg2.9.png
rename to res/drawable-finger/bg_chicklit_normal.9.png
Binary files differ
diff --git a/res/drawable-finger/bg_chicklit_pressed.9.png b/res/drawable-finger/bg_chicklit_pressed.9.png
new file mode 100644
index 0000000..2faaee1
--- /dev/null
+++ b/res/drawable-finger/bg_chicklit_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/chicklit_bg.png b/res/drawable-finger/chicklit_bg.png
deleted file mode 100644
index 8f0dc95..0000000
--- a/res/drawable-finger/chicklit_bg.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-finger/fasttrack.xml b/res/layout-finger/fasttrack.xml
index 9c9ab98..b2fa147 100644
--- a/res/layout-finger/fasttrack.xml
+++ b/res/layout-finger/fasttrack.xml
@@ -87,7 +87,6 @@
android:layout_height="wrap_content"
android:fadingEdgeLength="40dip"
android:padding="4dip"
- android:paddingBottom="10dip"
android:scrollbars="none">
<LinearLayout
@@ -103,15 +102,16 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/scroll"
- android:layout_marginLeft="60dip"
android:visibility="gone"
- android:background="#ff00"
+ android:cacheColorHint="@null"
+ android:divider="#fddd"
/>
<ImageView
android:id="@+id/arrow_down"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="3dip"
android:src="@drawable/arrow_down" />
</LinearLayout>
diff --git a/res/layout-finger/fasttrack_item.xml b/res/layout-finger/fasttrack_item.xml
index 1f8acee..cdc613f 100644
--- a/res/layout-finger/fasttrack_item.xml
+++ b/res/layout-finger/fasttrack_item.xml
@@ -20,4 +20,6 @@
android:layout_marginLeft="4dip"
android:layout_marginTop="4dip"
android:scaleType="centerInside"
- android:background="@drawable/chicklit_bg2" />
+ android:focusable="true"
+ android:clickable="true"
+ android:background="@drawable/bg_chicklit" />
diff --git a/res/layout-finger/fasttrack_resolve_item.xml b/res/layout-finger/fasttrack_resolve_item.xml
index f276511..9cff3c5 100755
--- a/res/layout-finger/fasttrack_resolve_item.xml
+++ b/res/layout-finger/fasttrack_resolve_item.xml
@@ -14,12 +14,52 @@
limitations under the License.
-->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:textAppearance="?android:attr/textAppearanceLargeInverse"
- android:gravity="center_vertical"
- android:drawablePadding="14dip"
- android:paddingLeft="15dip"
- android:paddingRight="15dip" />
+ android:orientation="horizontal"
+ android:paddingLeft="30dip"
+ android:paddingRight="30dip"
+ android:gravity="center_vertical">
+
+ <ImageView
+ android:id="@android:id/icon1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="5dip"
+ android:gravity="center"
+ android:scaleType="centerInside" />
+
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="5dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="7dip"
+ android:orientation="vertical"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@android:id/text1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+
+ <TextView
+ android:id="@android:id/text2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@android:id/icon2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dip"
+ android:gravity="center"
+ android:scaleType="centerInside" />
+
+</LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index de35898..661634b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -25,6 +25,8 @@
<attr name="icon" format="reference" />
<!-- Column in data table to summarize this data -->
<attr name="summaryColumn" format="string" />
+ <!-- Column in data table to show details of this data -->
+ <attr name="detailColumn" format="string" />
</declare-styleable>
<declare-styleable name="EdgeTriggerView">
