Merge heads

This commit is contained in:
youtaol
2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
-18
View File
@@ -37,24 +37,6 @@ limitations under the License.
<!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
<item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
</style>
<!-- The style for large size text -->
<style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large">
<!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- The style for medium size text -->
<style name="TextMedium" parent="@android:style/TextAppearance.DeviceDefault.Medium">
<!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<!-- The style for small size text -->
<style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small">
<!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
</style>
<style name="TrackWidgetLabel">
<!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
<item name="android:layout_gravity">center_horizontal</item>