Merge branch 'development' into keybase-proofs

2014-12-05 15:51:15 +01:00
parent a278382c28 38698bd891
commit 5c54ab1a0d
13 changed files with 31 additions and 35 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -456,7 +456,7 @@ public class PassphraseCacheService extends Service {
            Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
            intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
            builder.addAction(
-                    R.drawable.abc_ic_clear_normal,
+                    R.drawable.abc_ic_clear_mtrl_alpha,
                    getString(R.string.passp_cache_notif_clear),
                    PendingIntent.getService(
                            getApplicationContext(),