aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-07-17 07:26:46 -0700
committerScott Jackson <daneren2005@gmail.com>2014-07-17 07:26:46 -0700
commit1893c819430bee25de412f0cee8c1d0afa910a59 (patch)
tree8f0c96d22fc0c46d94857a96a7d7fca2bd7dfb5b
parent3eaf90cd71fc9ab4ab48207b725c242ae212d2e8 (diff)
downloaddsub-1893c819430bee25de412f0cee8c1d0afa910a59.tar.gz
dsub-1893c819430bee25de412f0cee8c1d0afa910a59.tar.bz2
dsub-1893c819430bee25de412f0cee8c1d0afa910a59.zip
Fix another GB crash case
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/values/styles.xml9
2 files changed, 4 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5e1b6878..b2704be6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="github.daneren2005.dsub"
android:installLocation="internalOnly"
- android:versionCode="117"
+ android:versionCode="118"
android:versionName="4.7.2">
<uses-permission android:name="android.permission.INTERNET"/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1ce49e4a..e32811fa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,32 +20,29 @@
<item name="android:layout_height">@dimen/Button.Small</item>
</style>
- <style name="MenuBarButton">
+ <style name="MenuBarButton" parent="@style/BasicButton">
<item name="android:layout_width">0dip</item>
<item name="android:layout_height">45dip</item>
<item name="android:layout_weight">1</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
- <item name="android:background">?android:selectableItemBackground</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
- <style name="DownloadActionButton">
+ <style name="DownloadActionButton" parent="@style/BasicButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">22sp</item>
- <item name="android:background">?android:selectableItemBackground</item>
<item name="android:paddingTop">4dip</item>
<item name="android:paddingBottom">4dip</item>
<item name="android:paddingRight">4dip</item>
<item name="android:paddingLeft">4dip</item>
</style>
- <style name="DownloadActionImageButton">
+ <style name="DownloadActionImageButton" parent="@style/BasicButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:background">?android:selectableItemBackground</item>
<item name="android:paddingTop">8dip</item>
<item name="android:paddingBottom">8dip</item>
<item name="android:paddingRight">16dip</item>