merge heads

This commit is contained in:
Jimmy Shih
2012-04-06 10:54:22 -07:00
parent 79fde1c118
commit f5085b208d
319 changed files with 6180 additions and 5754 deletions
+13 -13
View File
@@ -19,32 +19,32 @@ limitations under the License.
android:layout_width="fill_parent"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="2dip"
android:paddingTop="2dip">
android:paddingBottom="2dp"
android:paddingTop="2dp">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal">
<ImageView android:id="@+id/track_list_item_icon"
android:contentDescription="@string/track_list_icon_description"
android:contentDescription="@string/track_icon_description"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="4dip"
android:paddingRight="2dip"
android:paddingTop="5dip"
android:paddingLeft="4dp"
android:paddingRight="2dp"
android:paddingTop="5dp"
android:src="@drawable/track" />
<TextView android:id="@+id/track_list_item_name"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView android:id="@+id/track_list_item_category"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginTop="6dip"
android:layout_marginLeft="6dp"
android:layout_marginTop="6dp"
android:layout_width="fill_parent"
android:singleLine = "true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
@@ -53,21 +53,21 @@ limitations under the License.
<TextView android:id="@+id/track_list_item_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginLeft="6dp"
android:singleLine="true"
android:textColor="#fff"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/track_list_item_stats"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dip"
android:layout_marginLeft="6dp"
android:singleLine="true"
android:textColor="#0f0"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/track_list_item_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft = "6dip"
android:layout_marginLeft = "6dp"
android:singleLine = "false"
android:textAppearance="?android:attr/textAppearanceSmall"/>