cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Dominik Schürmann
2016-11-30 13:46:50 +01:00
parent d826e2c32e 8a83b7c92a
commit efb1868791
23 changed files with 2548 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/res/values/attr.xml
View File

@@ -28,4 +28,14 @@
<attr name="prefix" format="string" />
</declare-styleable>
<declare-styleable name="FastScroller">
<attr name="fastScrollScrollBarWidth" format="dimension"/>
<attr name="fastScrollAutoHideEnabled" format="boolean" />
<attr name="fastScrollAutoHideDelay" format="integer" />
<attr name="fastScrollThumbColorNormal" format="color" />
<attr name="fastScrollTrackColorNormal" format="color" />
<attr name="fastScrollThumbColorDragging" format="color" />
<attr name="fastScrollTrackColorDragging" format="color" />
</declare-styleable>
</resources>

3
OpenKeychain/src/main/res/values/colors.xml
View File

@@ -37,4 +37,7 @@
<color name="card_view_button">#7bad45</color>
<color name="toolbar_photo_tint">#1E7bad45</color>
<color name="pressed_gray">#0c000000</color>
<color name="selected_gray">#2c000000</color>
</resources>