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
+18 -4
View File
@@ -15,11 +15,25 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="ThemeSelector" parent="android:Theme.Holo">>
<item name="android:actionBarStyle">@style/MyTracksActionBar</item>
</style>
<style name="BottomButton" parent="@android:style/Widget.Holo.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/Holo.ButtonBar">
<!-- Same as BottomButtonBar in values/styles.xml except inheriting from a parent -->
<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="MyTracksActionBar" parent="@android:style/Widget.Holo.ActionBar">
<!-- Same image as the source except using a grey line instead of a blue line -->
<item name="android:background">@drawable/ab_transparent_dark_holo</item>
</style>
</resources>
<style name="ThemeSelector" parent="android:Theme.Holo">
<item name="android:actionBarStyle">@style/MyTracksActionBar</item>
</style>
</resources>