Merge heads

2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
@@ -144,12 +144,7 @@ limitations under the License.
        style="@style/TrackWidgetButton" />
      <TextView
        android:id="@+id/track_widget_record_status"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:layout_width="0dp"
-        android:singleLine="true"
-        style="@style/TextSmall" />
+        style="@style/TrackWidgetRecordStatus" />
      <ImageButton
        android:contentDescription="@string/icon_stop_recording"
        android:id="@+id/track_widget_stop_button"