aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-12-04 22:48:40 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-12-04 22:48:40 +0100
commit26341a325bb225d769823259895b11339a29306f (patch)
tree7044cf1b35ee225cabc73ce3a21ab94fbc3f6ce4 /OpenKeychain/src
parentac1cbad3ffe426b0f35ba4c15dddf4584e9b8cb4 (diff)
downloadopen-keychain-26341a325bb225d769823259895b11339a29306f.tar.gz
open-keychain-26341a325bb225d769823259895b11339a29306f.tar.bz2
open-keychain-26341a325bb225d769823259895b11339a29306f.zip
Update target and support libs to SDK 21, fixing compile issues
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java2
-rw-r--r--OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml1
-rw-r--r--OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml1
3 files changed, 1 insertions, 3 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(),
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
index 50134f4e7..b219038b2 100644
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
@@ -19,7 +19,6 @@
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
- android:divider="@drawable/abc_list_divider_holo_light"
android:showDividers="end" >
<include layout="@layout/actionbar_include_done_button" />
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
index 1d0476361..e9047e759 100644
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
+++ b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
@@ -18,7 +18,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:dividerPadding="12dp"
- android:divider="@drawable/abc_list_divider_holo_light"
android:orientation="horizontal"
android:showDividers="middle">