From af32c4f40fc9f5d3cbf31884859d3eb982278d80 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 30 Aug 2012 14:57:01 -0700
Subject: [PATCH] Improve resume/pause layout

---
 MyTracks/res/layout/track_list.xml            | 24 +++++++++----------
 .../apps/mytracks/TrackListActivity.java      |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/MyTracks/res/layout/track_list.xml b/MyTracks/res/layout/track_list.xml
index 6c54e185a..8e40948da 100644
--- a/MyTracks/res/layout/track_list.xml
+++ b/MyTracks/res/layout/track_list.xml
@@ -43,27 +43,27 @@ limitations under the License.
       android:layout_height="100dp"
       android:layout_width="wrap_content"
       android:scaleType="centerInside" />
-    <LinearLayout
+    <RelativeLayout
       android:layout_height="100dp"
       android:layout_marginLeft="-32dp"
-      android:layout_width="wrap_content"
-      android:orientation="vertical" >
-      <TextView
-        android:id="@+id/track_list_record_state"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:paddingTop="8dp"
-        android:textColor="@color/red"
-        style="@style/TextMedium" />
+      android:layout_width="wrap_content" >
       <TextView
         android:id="@+id/track_list_record_time"
+        android:layout_centerInParent="true"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:paddingLeft="24dp"
         android:paddingRight="8dp"
         android:textColor="@android:color/white"
-        style="@style/TextLarge" />
-    </LinearLayout>
+        style="@style/TextSmall" />
+      <TextView
+        android:id="@+id/track_list_record_state"
+        android:layout_above="@id/track_list_record_time"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:paddingBottom="12dp"
+        style="@style/TextSmall" />
+    </RelativeLayout>
     <ImageButton
       android:background="@android:color/transparent"
       android:contentDescription="@string/menu_stop_recording"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 362060984..9a09a1ac8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -522,6 +522,8 @@ public class TrackListActivity extends FragmentActivity implements DeleteOneTrac
         isRecording ? R.drawable.btn_stop_1 : R.drawable.btn_stop_0);
     stopRecordingImageButton.setEnabled(isRecording);
     if (isRecording) {
+      recordStateTextView.setTextColor(
+          getResources().getColor(isPaused ? android.R.color.white : R.color.red));
       recordStateTextView.setText(isPaused ? R.string.generic_paused : R.string.generic_recording);
       recordStateTextView.setVisibility(View.VISIBLE);
     } else {