Merge heads

This commit is contained in:
youtaol
2012-04-26 18:59:06 +08:00
parent 420cb0f49b
commit 6848a7a475
43 changed files with 1658 additions and 1414 deletions
+6 -18
View File
@@ -26,20 +26,11 @@ limitations under the License.
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:drawablePadding="8dp"
android:id="@+id/track_list_item_name"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:singleLine="true"
style="@android:style/TextAppearance.DeviceDefault.Large" />
style="@style/ListItemName" />
<TextView
android:id="@+id/track_list_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="wrap_content"
android:singleLine="true"
style="@android:style/TextAppearance.DeviceDefault.Small" />
style="@style/ListItemCategory" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
@@ -47,20 +38,17 @@ limitations under the License.
android:orientation="horizontal" >
<TextView
android:id="@+id/track_list_item_time"
style="@style/TrackListItemStatsTextView" />
style="@style/ListItemStat" />
<TextView
android:id="@+id/track_list_item_distance"
android:layout_marginLeft="8dp"
style="@style/TrackListItemStatsTextView" />
style="@style/ListItemStat" />
<TextView
android:id="@+id/track_list_item_start"
android:layout_marginLeft="8dp"
style="@style/TrackListItemStatsTextView" />
style="@style/ListItemStat" />
</LinearLayout>
<TextView
android:id="@+id/track_list_item_description"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:singleLine="false"
style="@android:style/TextAppearance.DeviceDefault.Small" />
style="@style/ListItemDescription" />
</LinearLayout>