Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+2 -2
View File
@@ -140,7 +140,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_record_track"
android:id="@+id/track_widget_record_button"
android:src="@drawable/record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/btn_stop_0"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"