merge heads

This commit is contained in:
Jimmy Shih
2013-04-29 12:33:54 -07:00
parent 97defda41c
commit ce80f4e39a
4 changed files with 93 additions and 14 deletions
+33 -3
View File
@@ -14,23 +14,53 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The style for choose activity text -->
<style name="TextChooseActivity">
<style name="BottomButton" parent="@android:style/Widget.DeviceDefault.Button.Borderless">
<!-- Same as BottomButton in values/styles.xml except inheriting from a parent -->
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dp</item>
<item name="android:maxLines">2</item>
</style>
<style name="BottomButtonBar" parent="@android:style/DeviceDefault.ButtonBar">
<!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent and adding measureWithLargestChild -->
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:orientation">horizontal</item>
<item name="android:measureWithLargestChild">true</item>
</style>
<style name="TextChooseActivity">
<!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
<!-- However, not able to specify textAppearance to @android:attr/textAppearanceListItemSmall -->
</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>
</resources>
<style name="TrackWidgetLabel">
<!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@color/orange</item>
<item name="android:textSize">10dp</item>
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
</style>
</resources>