From 00d03d452ecde61cd6fe29eeadbf7a3d2e9050e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 5 Sep 2013 21:25:49 +0200
Subject: [PATCH] Include DoneBar for edit activities

---
 .../res/drawable-hdpi/ic_action_cancel.png    | Bin 0 -> 1358 bytes
 .../res/drawable-hdpi/ic_action_done.png      | Bin 0 -> 1320 bytes
 .../res/drawable-mdpi/ic_action_cancel.png    | Bin 0 -> 1202 bytes
 .../res/drawable-mdpi/ic_action_done.png      | Bin 0 -> 1197 bytes
 .../res/drawable-xhdpi/ic_action_cancel.png   | Bin 0 -> 1488 bytes
 .../res/drawable-xhdpi/ic_action_done.png     | Bin 0 -> 1546 bytes
 .../res/layout/actionbar_custom_view_done.xml |  27 +++++++
 .../actionbar_custom_view_done_cancel.xml     |  29 ++++++++
 .../actionbar_include_cancel_button.xml       |  36 +++++++++
 .../layout/actionbar_include_done_button.xml  |  36 +++++++++
 .../res/layout/api_app_settings_activity.xml  |  29 +-------
 .../res/menu/api_app_settings.xml             |  13 ++++
 OpenPGP-Keychain/res/values/strings.xml       |   1 +
 .../remote_api/AppSettingsActivity.java       |  69 +++++++++++++-----
 14 files changed, 194 insertions(+), 46 deletions(-)
 create mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png
 create mode 100644 OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png
 create mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png
 create mode 100644 OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png
 create mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png
 create mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
 create mode 100644 OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
 create mode 100644 OpenPGP-Keychain/res/menu/api_app_settings.xml

diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde36e1fa7b8fb99cd7cdb3dc1e18466196750b0
GIT binary patch
literal 1358
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVitz{uRt(ZJBu$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OnfUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dF1J{^
zx#2Vqsy79<TMTgO)dxC89~8AnQ4JFUrXLU!o^XL2c+yYJ1E%*PV8V90pR|mDf$@N+
zi(^Q|tv55zdmVNVIJUiTBm4WN_kmRtX5E^-AmBq>jq(2n!XhGjGPNr-YWW@CJDHmK
zJ&5LLy_WOYcc}%pyr$}zn*DR{o;AsRQu%IMrAprEc1DQ?5c-qP5dZa9*lN*t_QHER
z?wyGH=Gwl<I?!yc-%HVquBt`Ff%a_s9=UuI+}$2i(ja`%;fw044m}S6xs6sGwhnq$
z2V6|t4*3U8XAnG7E_hk_c*{Qals#SRTrGvp73d!G-I$j>V}9bzo}}cX=i=H})~T@^
z-4ng}PpM+Yv)JCRyY*PE?peK)F<J4&Guej{Yq%CB&13u^eMEJg*0V^4(+WWs&G&hm
zo-t+=Q@kY9a@puS8;3ynqMa`?68UWo{<(82^C(x#Wi=he_*G{N)p~Zd2(f-%Xqdgo
zQ2Md)YQ~V22UZpDldxXG7QmV?_2-_HYncueuAgT*iF>nl<no6o{AoM0+VKbPtnkJU
z(q{hc9gG$Na~HWLd@(yMb)fBq-2Q_r`8SyfiFB5G_C_{HD5kZ^<o0sebl82k_iW}3
zA(jr7t9y@Lp3N69<wxL__VDg4b!;2k7L`9)A+tO2e~=V7bU^|9@P}Xm1J}c|E6;YF
Q3;>mIp00i_>zopr0MX;(_W%F@

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_action_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..58bf972171f199c359dcdb3bc6233ac84c7853d3
GIT binary patch
literal 1320
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi#&Ct}+$imdr$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+d7PlC?
zn3-5OIXVK(v%u~ah~5<3ZZW~>7JZ;&^g&UJ6xA>xVEO?u;RzSWfhYacJYae+0w(OB
zPunsW7#L@Hx;TbZ+<G%}x7QH|k+yQv7pr=eb|@Tl5@FdI(A276*EUy7N$HjJ50$3Y
zMN`EdEfsdLR@F~@${kS={m8zE>F}XRH$BVJ_~tbB>ux&w{i&Jpl6k3-y`NvKHk21q
zV1%GG?pIzqOj6l*_t-(U9qjp;vo`HwN=}ep)5vUa_N7?Rr}hN4ng+Fwoh&_BpW+wD
z&uL8OV?3O|erD1ih8>LjGWVRk>cn-L{3q>ay)F~Cc;}x<WzVMm5pAzrFlEpChD)F9
zn6)N;7Y&%XC)2?;q;hgYWdX}Frz!ee5e(G{eb-bAGd{U8Dlc#p_MW`#hlR?|MGfKw
zJavwzjTSBcq;~#*w#CMt7d!X7j6R{3<T3gDb+hu&)8)qeCBh5KDrYCmd~&t;3x{6q
z`%Yh_DSyNwu0EN6pi*P@FF(P_B{3)0H|HC8d|Ljce*5fSO&q4%UY0jK>n`8m#J@(k
z@^-_wj*fK>KI!`&dhL6Y<hOtBl^=z=@kg^v`ZF$`c^k6tjP4aV!Ha2s4lVujKPb}f
jlV<~q2NeDNA)LTq_^Hw$=hos4pt8%;)z4*}Q$iB}o<G>6

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f4c3d6a2b5bffc7529ef77789f4b9a1258c967e
GIT binary patch
literal 1202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVitz{uRt(ZJNy$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY
zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zW{wmsWnf@b@pN$v
zskrrKx+7PUgGig{Ew_XRoJvIx&xNMH;Bgf9c%jf3>+pg{?(kf0RjbAe4(c1sKd|em
z&8?IYI&<KB&*L+H=AYTKe3$QKi{NQ9jSDw2h$R#?R9-);(X}n)t*7S8%pKplN>oxS
z=Y{Jq%y{p?9pof5>zUk37p}tC!tD>-v^*F!j~%jlX824bqPdnW%cgQA=S4Gp!|ifa
z9Ia|Cr($|US!)G!iZ2_4IO-@)+vz7#(>$R~`U>BzW6$omsPO6;#5k+|I&weNiLb$?
zApOlxX08j*|4J>Wz4iXaXO`T_DMy(CT5oY1d4}mU?6VM$>A1=9tXbg~L(O58#Z4dD
z8Du_qnR*)Kb_ir|Fivc<GW9Vkdh_+O<0aDzTkX}v4lw!feh^Dw*r}Fq{cmYmF{l*r
MboFyt=akR{0B+)xg#Z8m

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_action_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf5fab3adf243318d11ec95448c6deae3f52d9b1
GIT binary patch
literal 1197
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi#&Ct}+$imXp$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O?oUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1@
zG!Lpb1-Dx)aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z*4|&C&cMJZ@9E+g
zQgQ3ebbs!H2{Omc#n}0tv`#21C~#0@f8W4;a{i~dB^meHw?8lo^y+Np_VX($n(_YC
z@+E&a+Mh40ocC+XEx!5ZZ+*78?c#g6#lYQ#qw)iToIq8>mujbJsbce3PBczkwdxup
zkDJUF2f-x=jZU}=Fgph@h!<?CWwGnicroD*-?Ik-S5&S%jSW!xdB)?M)&u4BH7CD2
z>N>j@?Pr!beU|A<XC%AkwW7@pYA>1vJvL35&6;ySFy-J4wL_Ed=se(2D>)PC;-R9y
zdup`rq1*C;xs&W09=YXh=ju@sDp||AN+rHQcJ=j-`9~Vw?O~j!62JMM+>gE!%~B^t
z*B7ZvUsQj@6<2p>=j`nZ<qTORH+;?hE%LLUlm7u@BKsaz35Kb;eu6rZ+223~h^MQc
J%Q~loCIIwnnArdT

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca7d159fdaa906473fa7ce7a63814ced79c89db3
GIT binary patch
literal 1488
zcmaJ>eM}Q~7(QxcD@Za65}eZ<M;#=y_fcAEPs&Go1sXhPpqrhU({gvfrQC<tL)tnw
zM%Xeo78aro2ph~l6t_ttSr(_r#KjG>sB-}ef}1mJ=pu1TnGR)hR|K{{WS89i-rt+|
zdEV#!$Thi23KQa<jspN7!C6F<DQ8~veKJ=0e$4LvK{?jS4v$<eRLXT;i2?Fyp@IRO
zoVSW8W4v^5_jx8809NQ&w@3DnTX9O@U~e=A4sfD^27v6`fas-sj0{#VRV;6X?wtA(
z0$JJ$Z8MQ5DcYH8wkRYq<)IQc74lIQ8p_Q9vjez7z%jBH3~)8P9}ifed0t$xqizHO
z=R;(l6?!DfL%Kk_ATgi`M)ee$g@IW{7&D?4qh%9lKrs}-3<zr0V<>Ji<0u9$Jdl!2
zqAT$-qF^DHa<f9!vMk~VQdd_8*JZ+jRE1y`iv>Xqh{2#&BJ}<sFM9)e-k-L}Krntv
zVnvx1creQ7tq^KuE2JoWR01b1(enO<HYp850$vfpU^H6NVjxNWe<;T-Mf>G4=3l*!
zCHA|6B7>AMexX*Pl)+V|MN^5mU1GelAh`vhX0eN|YC#tK)q)7x%S|u_l3t4Cqn>#L
zN#ai4FMD~4aS~QY;ec6|#<2ohCT1rbCL2m%m;<vIF^j`!v*#C>FtgEyEn*3Qs^u77
zUc}N0)_@w!n5AHOY;+koQOQg&61#_?3nYO9=ZnVK<+a$C*YXHUKSs+!9mKL&L=l5T
zNBf^qFS?ZdiJD7`t6Y{=pW&5#mz2f6ccobc04kf4$ae>>-tH(ZQDG_Pwv4FXtwJ~0
z_MCuf=vxKiM;j7$bibTuCd}{`>fcwzzIf(OQ_ysQ)?MrxSo>9Y@{QEg>F|$x*B`#1
zV>>!_@J%Wg5SJH|0j%r>lIj;O^{Qjz(<fV2Ts~Hv8cGen3gfFuVrOKw-<|$oP2A?B
zYj0g7jvP90^MG-7;HJuSVo&<^gSUoW$hfh6IC0-eT~jZy;_T!TDbEd#T8Aq}ft>62
zKdjbEK2}{<f#;s}_?l1K^fGYi5c}Pw*zobz>mQg?z76L%6kn|G@724T+Z(f|5}SA2
z8lZd`e6mF|-r4p1^u(1(*QYwdKfnW6>r*4MDZsB=ZSoWq)03u2nxa%at?G`*@tFNi
z)krY59&&bX+4)UnPmwlD45ts0;xluVbMHhho42h3ax}^C1Ko)`?+*(7kvD(JUYFO_
zh}}3nctq2CO&b9DPmThwXy>eFN=NBuAAY@QsAIiwTRn4JT{eWgZrtp4wiVa6*Z-zV
zKR3$$(h=+<R=#&H_s-QsdMLekcq4kIvF~AI?9{%ymciG${+d$H{h?{8Rf1eIV>x%v
zYuDtBRqYLFYvMZvqvrFC7tIIN<IvPPX9L$BnbD0V<E3N+cQo>u&K-jqCo=mvXG&Jg
zb<Z%S*!?=$6~7M=TWk~Y+Tt6|l0cuV3l%DT<G)XQ32ECKX#TnLVbF27rtp62{>M!A
ccEy9_T>$nr-nlNE-y8kMIvpiMuWeVuKec}rRR910

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_action_done.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8915716e06792d926f397a7b17346f656c86aa1
GIT binary patch
literal 1546
zcmaJ>eM}Q~7(NOZ>jx?|Mx7)_1qW{Q?n+DPg;FVn(P<eL2AvAw+8*>M_rcwjwgk7z
zaExq;FcCM$1T(WNW-4=WI(1VrnIo~NbIM>M*htY0#}vP^FxeFW{X=%i-TV8!d7tO~
zdUEwS*{>~}w{ji;01FLSdXr$+1>d=Igzo{O;<{i~@EK-4moDL57>fgGHrj%N1`;d9
zO*m%rRCM7f01z5O<e7Q1aRX|lNf{Q5k-14mKm$OE*3Dp62hM{Qyp*6c($SNrr66I`
zNDGuk*vO>gb|R~a#dE8&^Q=`4tJ)^jrh+MMR3IR69s}KEImMxFjdYS170y97Bn2l!
zc!x&%v?#MN2TZ3~98}8S1S_0`fJq7&qJY&3^{b#9Mqmh$L$E3Vfl;Ljg%NP-kqX&Z
zTM25?XHMl3ZW^hb=NS}&TrQW)l_;axQV3D2)etO)<nja|B7yTzJmyZIxYg4PdYrSe
z1j7?F1qK;03+?1JQlZkPEs)F%EyYcZNf;R9#ux~Z!NHcM1C7T24<*T&XpT4G&+2_4
zF_-6IaL9ynw3D?8iz`_jOvRw-EROLsn@7{-(^Jf`(>%@DX$DNsRmu?1h*=3L=$S+q
zji`a*c#N{*2E9fqaL5S4h9>Hh6v?`@WTg&HMvx3dtw7Wn3SD|yrV>#pbjUPTPg|WN
zPVv)N+cT_sR%}oVBqL<j<1A5$+cH_21SgwDiP>vOnw4(~Yn#0m)vQ=ZC<Y3y_PJG0
zy9E6Nk2As*E;G`{DM9b7Ando~fqnoGRU7nadG5ZEPYYiO+qnE(scJNanoC{-heQb#
zH#RjMZmYd_FQi(srD49y#CE6}EKt)HcYI@{1v+(j_XF*N4PVs%)P25JT^jKG(bLyU
zj*U-DcpkP$zAjI4=)d!4p8X)aIK&Jr^FC+1_WW&^U;3zPKlNUOSHi57?Kj2KB7460
z;-Ui^LQ-B{_jy@ZZd=H&??UYn@{J#dl#Cr66jyt(i&5L7<My=9ao((4uyh;AEPl8d
zO!M`43r^&VD$g7l+7u@N=kzD{kFHohR#!Zv_5Io6En|z$PW1jVj+n!CU`2D^ymZD9
zPB#a3oDm&=<c!|`<(O}<GccZ#Rp*Hxxmn%kt6QeO;`uBR?DP~yf<8}FBzVPhMFRGF
zRN}Z$BUX`G5OOwPS#Z84yQ}+xw^`eAdS^wAKW|sDDCYL=B|850U)8e2wy67;0)9zT
z%|?{@t>?~O*G{jdJ<Za2t9@ThrKRu$+PYqJy<??Pn{^>EH8vU^=Avr+i|X?`*2LY9
z7jHvHE29PrBH!kINN(*uSt$Oev6h7iu1N7t^Bcq8%eH4kerw;l_*m?|A2AK`y6?34
zP`@{J#lYB+FlJ}1sp{bG{!_i<tBx<Q`0hBNzXv`kMhC2pC(V1bi^?wFaH?)K)kf?Y
z@edc3r8>CO_Q1c_7CzZkyMzhv`>@qo7TfY@Gmt3uSG*tgxNWQc=v|JYQSD*fn7li5
z#PB$#i7UEVf00h?$hp1uLQj2zQtZFGsWX7jD_#?wJrFj3Z4#6Vd{fyGdK_MQaQVc!
gtQRZb>M<Y`_^PPu=gwxys^H(*kdduFq${rZ4`&KL5dZ)H

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
new file mode 100644
index 000000000..bcbb5f5c1
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done.xml
@@ -0,0 +1,27 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="@drawable/abs__list_divider_holo_light"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="end" >
+
+    <include layout="@layout/actionbar_include_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
new file mode 100644
index 000000000..8c8428e75
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_custom_view_done_cancel.xml
@@ -0,0 +1,29 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="@drawable/abs__list_divider_holo_light"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle" >
+
+    <include layout="@layout/actionbar_include_cancel_button" />
+
+    <include layout="@layout/actionbar_include_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
new file mode 100644
index 000000000..0f0521d3c
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_include_cancel_button.xml
@@ -0,0 +1,36 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_cancel"
+    style="@style/Widget.Sherlock.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1" >
+
+    <TextView
+        android:id="@+id/actionbar_cancel_text"
+        style="@style/Widget.Sherlock.ActionBar.TabText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_action_cancel"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:text="Cancel (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml b/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
new file mode 100644
index 000000000..e14853be3
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/actionbar_include_done_button.xml
@@ -0,0 +1,36 @@
+<!--
+      Copyright 2013 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_done"
+    style="@style/Widget.Sherlock.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1" >
+
+    <TextView
+        android:id="@+id/actionbar_done_text"
+        style="@style/Widget.Sherlock.ActionBar.TabText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_action_done"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:text="Save (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index b5e6e46ae..3157a3f09 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:padding="8dp"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent" >
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
@@ -13,25 +11,4 @@
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="3dip" >
-
-        <Button
-            android:id="@+id/api_app_settings_revoke"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/api_settings_revoke" />
-
-        <Button
-            android:id="@+id/api_app_settings_save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/api_settings_save" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/menu/api_app_settings.xml b/OpenPGP-Keychain/res/menu/api_app_settings.xml
new file mode 100644
index 000000000..1ee05f5de
--- /dev/null
+++ b/OpenPGP-Keychain/res/menu/api_app_settings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_api_settings_revoke"
+        android:showAsAction="never"
+        android:title="@string/api_settings_revoke"/>
+    <item
+        android:id="@+id/menu_api_settings_cancel"
+        android:showAsAction="never"
+        android:title="@string/api_settings_cancel"/>
+
+</menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index d6253ea57..5aa4081fb 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -368,6 +368,7 @@
     <string name="api_settings_no_key">No key selected</string>
     <string name="api_settings_select_key">Select key</string>
     <string name="api_settings_save">Save</string>
+    <string name="api_settings_cancel">Cancel</string>
     <string name="api_settings_revoke">Revoke access</string>
     <string name="api_register_text">%1$s (%2$s) requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string>
     <string name="api_register_allow">Allow access</string>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
index 6316dbc38..0cfbbe3fc 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
@@ -5,7 +5,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.util.Log;
 
-import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -14,13 +13,16 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
+import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 
 public class AppSettingsActivity extends SherlockFragmentActivity {
     private PackageManager pm;
@@ -46,28 +48,36 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
 
         pm = getApplicationContext().getPackageManager();
 
+        // BEGIN_INCLUDE (inflate_set_custom_view)
+        // Inflate a "Done" custom action bar view to serve as the "Up" affordance.
+        final LayoutInflater inflater = (LayoutInflater) getSupportActionBar().getThemedContext()
+                .getSystemService(LAYOUT_INFLATER_SERVICE);
+        final View customActionBarView = inflater
+                .inflate(R.layout.actionbar_custom_view_done, null);
+
+        ((TextView) customActionBarView.findViewById(R.id.actionbar_done_text))
+                .setText(R.string.api_settings_save);
+        customActionBarView.findViewById(R.id.actionbar_done).setOnClickListener(
+                new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // "Done"
+                        save();
+                    }
+                });
+
+        // Show the custom action bar view and hide the normal Home icon and title.
+        final ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM
+                | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE);
+        actionBar.setCustomView(customActionBarView);
+        // END_INCLUDE (inflate_set_custom_view)
+
         setContentView(R.layout.api_app_settings_activity);
 
         selectedKey = (TextView) findViewById(R.id.api_app_settings_selected_key);
         selectKeyButton = (Button) findViewById(R.id.api_app_settings_select_key_button);
         asciiArmorCheckBox = (CheckBox) findViewById(R.id.api_app_ascii_armor);
-        revokeButton = (Button) findViewById(R.id.api_app_settings_revoke);
-        saveButton = (Button) findViewById(R.id.api_app_settings_save);
-
-        revokeButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                revokeAccess();
-            }
-        });
-        saveButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                save();
-            }
-        });
 
         Intent intent = getIntent();
         appUri = intent.getData();
@@ -81,6 +91,26 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getSupportMenuInflater().inflate(R.menu.api_app_settings, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.menu_api_settings_revoke:
+            revokeAccess();
+            return true;
+        case R.id.menu_api_settings_cancel:
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private void loadData(Uri appUri) {
         Cursor cur = getContentResolver().query(appUri, null, null, null, null);
         if (cur.moveToFirst()) {
@@ -114,7 +144,6 @@ public class AppSettingsActivity extends SherlockFragmentActivity {
     }
 
     private void save() {
-        Log.d(Constants.TAG, "saving");
         final ContentValues cv = new ContentValues();
         // cv.put(KeychainContract.ApiApps.PACKAGE_NAME, packageName);
         cv.put(KeychainContract.ApiApps.ASCII_ARMOR, asciiArmorCheckBox.isChecked());