Merge heads

This commit is contained in:
youtaol
2012-05-15 16:58:38 +08:00
parent f1573a550a
commit 37bfefaa3d
29 changed files with 379 additions and 499 deletions
+42 -30
View File
@@ -19,41 +19,53 @@ limitations under the License.
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:orientation="horizontal"
android:padding="8dp" >
<ImageView
android:contentDescription="@string/icon_track"
android:id="@+id/list_item_icon"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/track" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_width="fill_parent"
android:orientation="horizontal" >
android:orientation="vertical" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/list_item_name"
android:singleLine="true"
style="@style/TextLarge" />
<TextView
android:id="@+id/list_item_category"
android:layout_marginLeft="8dp"
android:singleLine="true"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/list_item_total_time"
android:layout_marginRight="8dp"
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_total_distance"
android:layout_marginRight="8dp"
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_start_time"
style="@style/ListItemStats" />
</LinearLayout>
<TextView
android:id="@+id/list_item_name"
android:singleLine="true"
style="@style/TextLarge.WithIcon" />
<TextView
android:id="@+id/list_item_category"
android:layout_marginLeft="8dp"
android:singleLine="true"
android:id="@+id/list_item_description"
android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal" >
<TextView
android:id="@+id/list_item_total_time"
android:layout_marginRight="8dp"
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_total_distance"
android:layout_marginRight="8dp"
style="@style/ListItemStats" />
<TextView
android:id="@+id/list_item_start_time"
style="@style/ListItemStats" />
</LinearLayout>
<TextView
android:id="@+id/list_item_description"
android:singleLine="false"
android:textColor="@android:color/secondary_text_dark"
style="@style/TextSmall" />
</LinearLayout>