diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-13 13:40:47 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-13 13:40:47 +0100 |
| commit | 9a1ce093bfadd9de33397f15c39a4c6f52a4abd6 (patch) | |
| tree | daae15efacae7820d94388e7a5976d7d0eed8348 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java | |
| parent | 6af65a2a9b5f90b90bf8752820f40f89241d8014 (diff) | |
| parent | f5c50c3896fa0f406ce4b90a9470395eaf6784a4 (diff) | |
| download | open-keychain-9a1ce093bfadd9de33397f15c39a4c6f52a4abd6.tar.gz open-keychain-9a1ce093bfadd9de33397f15c39a4c6f52a4abd6.tar.bz2 open-keychain-9a1ce093bfadd9de33397f15c39a4c6f52a4abd6.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java index 65461cb4f..9f25fac42 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java @@ -30,6 +30,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.util.Choice; +import android.annotation.TargetApi; import android.app.DatePickerDialog; import android.app.Dialog; import android.content.Context; @@ -110,6 +111,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener { setExpiryDate(null); mExpiryDateButton.setOnClickListener(new OnClickListener() { + @TargetApi(11) public void onClick(View v) { GregorianCalendar date = mExpiryDate; if (date == null) { |