Skip to content

Commit

Permalink
Fix Samsung theme bug
Browse files Browse the repository at this point in the history
  • Loading branch information
EXL committed Jul 12, 2016
1 parent cde9495 commit 13f26c0
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 6 deletions.
3 changes: 2 additions & 1 deletion AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".AstroSmashLauncher"
android:configChanges="keyboard|keyboardHidden|orientation"
Expand Down
8 changes: 6 additions & 2 deletions res/values-v11/style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<resources>

<style name="DialogBaseTheme" parent="@android:style/Theme.Holo.Dialog.MinWidth">
<!-- API 11 theme customizations can go here. -->
<!-- API 11 theme customizations can go here. -->
</style>

</resources>
<style name="AppBaseTheme" parent="@android:style/Theme.Holo">
<!-- API 11 theme customizations can go here. -->
</style>

</resources>
8 changes: 6 additions & 2 deletions res/values-v14/style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<resources>

<style name="DialogBaseTheme" parent="@android:style/Theme.DeviceDefault.Dialog.MinWidth">
<!-- API 14 theme customizations can go here. -->
<!-- API 14 theme customizations can go here. -->
</style>

</resources>
<style name="AppBaseTheme" parent="@android:style/Theme.DeviceDefault">
<!-- API 14 theme customizations can go here. -->
</style>

</resources>
12 changes: 12 additions & 0 deletions res/values-v21/style.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="DialogBaseTheme" parent="@android:style/Theme.Material.Dialog.MinWidth">
<!-- API 21 theme customizations can go here. -->
</style>

<style name="AppBaseTheme" parent="@android:style/Theme.Material">
<!-- API 21 theme customizations can go here. -->
</style>

</resources>
7 changes: 6 additions & 1 deletion res/values/style.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@

<style name="DialogBaseTheme" parent="@android:style/Theme.Dialog"></style>

<style name="AppBaseTheme" parent="@android:style/Theme.Black"></style>

<!-- Dialog theme. -->
<style name="DialogTheme" parent="DialogBaseTheme"></style>

</resources>
<!-- Application theme. -->
<style name="AppTheme" parent="AppBaseTheme"></style>

</resources>

0 comments on commit 13f26c0

Please sign in to comment.