am ab847acd: am 12e2500b: Merge "Fix bug 3381563 - fix segmented button styles" into honeycomb

* commit 'ab847acd5e116cc60efbc6ac5a332ee5353966c0':
  Fix bug 3381563 - fix segmented button styles
This commit is contained in:
Adam Powell
2011-01-23 17:13:34 -08:00
committed by Android Git Automerger
5 changed files with 4 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@@ -1432,11 +1432,11 @@
<item name="divider">?android:attr/dividerVertical</item>
<item name="showDividers">middle</item>
<item name="dividerPadding">8dip</item>
<item name="background">@android:drawable/btn_default_holo_dark</item>
<item name="background">@android:drawable/btn_group_holo_dark</item>
</style>
<style name="Holo.SegmentedButton" parent="SegmentedButton">
<item name="android:background">@android:drawable/btn_default_holo_dark</item>
<item name="android:background">@android:drawable/btn_group_holo_dark</item>
</style>
<style name="Holo.ButtonBar.AlertDialog">
@@ -1817,7 +1817,7 @@
</style>
<style name="Holo.Light.ButtonBar" parent="Holo.ButtonBar">
<item name="android:background">@android:drawable/btn_default_holo_light</item>
<item name="android:background">@android:drawable/btn_group_holo_light</item>
</style>
<style name="Holo.Light.ButtonBar.AlertDialog">
@@ -1825,7 +1825,7 @@
</style>
<style name="Holo.Light.SegmentedButton" parent="SegmentedButton">
<item name="android:background">@android:drawable/btn_default_holo_light</item>
<item name="android:background">@android:drawable/btn_group_holo_light</item>
</style>
<style name="Widget.Holo.Light.TextView" parent="Widget.TextView">