Merge heads

This commit is contained in:
youtaol
2013-07-03 11:19:22 +08:00
parent 7bee6470bd
commit b4e94b9af1
53 changed files with 135 additions and 60 deletions
+2 -12
View File
@@ -254,6 +254,8 @@ limitations under the License.
<style name="TrackWidgetButton">
<item name="android:background">@android:color/transparent</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_height">63dp</item>
<item name="android:layout_width">63dp</item>
<item name="android:scaleType">fitXY</item>
</style>
<!-- track widget button container -->
@@ -266,18 +268,6 @@ limitations under the License.
<item name="android:paddingBottom">4dp</item>
<item name="android:paddingTop">4dp</item>
</style>
<!-- track widget button record -->
<style name="TrackWidgetButtonRecord" parent="@style/TrackWidgetButton">
<item name="android:layout_height">63dp</item>
<item name="android:layout_width">75dp</item>
<item name="android:src">@drawable/btn_record</item>
</style>
<!-- track widget button stop -->
<style name="TrackWidgetButtonStop" parent="@style/TrackWidgetButton">
<item name="android:layout_height">63dp</item>
<item name="android:layout_width">63dp</item>
<item name="android:src">@drawable/btn_stop_0</item>
</style>
<!-- track widget config spiner -->
<style name="TrackWidgetConfigSpinner">
<item name="android:layout_gravity">center_horizontal</item>