PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Update target and support libs to SDK 21, fixing compile issues

Browse source
This commit is contained in:
Dominik Schürmann 2014-12-04 22:48:40 +01:00
parent ac1cbad3ff
commit 26341a325b
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OpenKeychain/build.gradle
View file

@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
dependencies { dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
compile 'com.android.support:support-v4:19.1.0' compile 'com.android.support:support-v4:21.0.2'
compile 'com.android.support:appcompat-v7:19.1.0' compile 'com.android.support:appcompat-v7:21.0.2'
compile project(':extern:openpgp-api-lib') compile project(':extern:openpgp-api-lib')
compile project(':extern:openkeychain-api-lib') compile project(':extern:openkeychain-api-lib')
compile project(':extern:html-textview') compile project(':extern:html-textview')
@ -23,12 +23,12 @@ dependencies {
} }
android { android {
compileSdkVersion 19 compileSdkVersion 21
buildToolsVersion '19.1' buildToolsVersion '21.1.1'
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 19 targetSdkVersion 21
} }
/* /*

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
View file

@ -456,7 +456,7 @@ public class PassphraseCacheService extends Service {
Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class); Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR); intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
builder.addAction( builder.addAction(
R.drawable.abc_ic_clear_normal, R.drawable.abc_ic_clear_mtrl_alpha,
getString(R.string.passp_cache_notif_clear), getString(R.string.passp_cache_notif_clear),
PendingIntent.getService( PendingIntent.getService(
getApplicationContext(), getApplicationContext(),

1
OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
View file

@ -19,7 +19,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:dividerPadding="12dp" android:dividerPadding="12dp"
android:orientation="horizontal" android:orientation="horizontal"
android:divider="@drawable/abc_list_divider_holo_light"
android:showDividers="end" > android:showDividers="end" >
<include layout="@layout/actionbar_include_done_button" /> <include layout="@layout/actionbar_include_done_button" />

1
OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
View file

@ -18,7 +18,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:dividerPadding="12dp" android:dividerPadding="12dp"
android:divider="@drawable/abc_list_divider_holo_light"
android:orientation="horizontal" android:orientation="horizontal"
android:showDividers="middle"> android:showDividers="middle">