merge heads

This commit is contained in:
Jimmy Shih
2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
+11 -6
View File
@@ -27,10 +27,13 @@ limitations under the License.
android:orientation="horizontal" >
<TextView
android:id="@+id/list_item_name"
style="@style/ListItemName" />
android:singleLine="true"
style="@style/TextLarge.WithIcon" />
<TextView
android:id="@+id/list_item_category"
style="@style/ListItemCategory" />
android:layout_marginLeft="8dp"
android:singleLine="true"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
@@ -39,16 +42,18 @@ limitations under the License.
<TextView
android:id="@+id/list_item_total_time"
android:layout_marginRight="8dp"
style="@style/ListItemStat" />
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_total_distance"
android:layout_marginRight="8dp"
style="@style/ListItemStat" />
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_start_time"
style="@style/ListItemStat" />
style="@style/ListItemStats" />
</LinearLayout>
<TextView
android:id="@+id/list_item_description"
style="@style/ListItemDescription" />
android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>