diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-05 15:51:15 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-05 15:51:15 +0100 |
| commit | 5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937 (patch) | |
| tree | a03465ba8ba3edde479683d40a0d460741a3f4fd /OpenKeychain/src/main/java | |
| parent | a278382c285fa5656d27b1507cd9026940fa6900 (diff) | |
| parent | 38698bd891caa97e3b97d13640654b74b35a9a38 (diff) | |
| download | open-keychain-5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937.tar.gz open-keychain-5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937.tar.bz2 open-keychain-5c54ab1a0d9eaee7dc5599978d4f15ad7bc64937.zip | |
Merge branch 'development' into keybase-proofs
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index 63cb6494d..869d2e71b 100644 --- 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(), |