From a30e19e365321b4d9b6b59b8699662718b863dfd Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Thu, 5 Apr 2012 09:06:59 -0700 Subject: [PATCH] merge heads --- MyTracks/res/layout/track_list_item.xml | 18 +- MyTracks/res/values/styles.xml | 10 +- .../UploadResultActivityTest.java | 169 ++++++++++++++++++ 3 files changed, 181 insertions(+), 16 deletions(-) create mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java diff --git a/MyTracks/res/layout/track_list_item.xml b/MyTracks/res/layout/track_list_item.xml index 608174002..3c0f033ed 100644 --- a/MyTracks/res/layout/track_list_item.xml +++ b/MyTracks/res/layout/track_list_item.xml @@ -46,27 +46,15 @@ limitations under the License. android:orientation="horizontal" > + style="@style/TrackListItemStatsTextView" /> + style="@style/TrackListItemStatsTextView" /> + style="@style/TrackListItemStatsTextView" /> @color/stat_label_text - + + + +