Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '566-raise-api-level' into 'master'

Browse Source 
Stop supporting Gingerbread

Closes #566

See merge request !278
This commit is contained in:
Torsten Grote
2016-08-22 16:52:41 +00:00
parent 659cf85ca1 48e1a65a24
commit bc6557e82d
16 changed files with 49 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/res/values-v14/styles.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="BriarTheme" parent="BriarBaseTheme">
<!-- This fixes a UI bug in the support preference library -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
<style name="BriarButton.Default">
<item name="android:textAllCaps">true</item>
</style>
</resources>

6
briar-android/res/values/styles.xml
View File

@@ -22,6 +22,10 @@
<item name="elevation">1dp</item>
</style>
<style name="BriarButton.Default">
<item name="android:textAllCaps">true</item>
</style>
<style name="BriarButton" parent="Widget.AppCompat.Button.Colored">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
@@ -29,8 +33,6 @@
<item name="android:padding">@dimen/margin_large</item>
</style>
<style name="BriarButton.Default"/>
<style name="BriarButtonFlat.Negative" parent="Widget.AppCompat.Button.Borderless">
<item name="android:textColor">@color/briar_button_negative</item>
<item name="android:textSize">@dimen/text_size_medium</item>

2
briar-android/res/values/themes.xml
View File

@@ -34,7 +34,7 @@
<style name="BriarThemeNoActionBar.Default"/>
<style name="BriarTheme" parent="BriarBaseTheme">
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item>
</style>