From a66d225b9feff54bdd5bb597102839fe2cdbc75f Mon Sep 17 00:00:00 2001
From: Michael Kaiser <patheticpat@googlemail.com>
Date: Mon, 15 Apr 2013 17:42:38 +0200
Subject: [PATCH] Make removal of queued items undoable

---
 res/drawable-xhdpi/ic_undobar_undo.png        | Bin 0 -> 1558 bytes
 res/drawable-xhdpi/undobar.9.png              | Bin 0 -> 1665 bytes
 .../undobar_button_focused.9.png              | Bin 0 -> 1141 bytes
 .../undobar_button_pressed.9.png              | Bin 0 -> 1123 bytes
 res/drawable-xhdpi/undobar_divider.9.png      | Bin 0 -> 963 bytes
 res/drawable/undobar_button.xml               |  22 +++
 res/layout/organize_queue.xml                 |   7 +-
 res/values/integers.xml                       |   3 +
 res/values/strings.xml                        |   4 +-
 res/values/styles.xml                         |  40 +++++-
 .../activity/OrganizeQueueActivity.java       |  74 +++++++++-
 .../antennapod/util/UndoBarController.java    | 135 ++++++++++++++++++
 12 files changed, 279 insertions(+), 6 deletions(-)
 create mode 100644 res/drawable-xhdpi/ic_undobar_undo.png
 create mode 100644 res/drawable-xhdpi/undobar.9.png
 create mode 100644 res/drawable-xhdpi/undobar_button_focused.9.png
 create mode 100644 res/drawable-xhdpi/undobar_button_pressed.9.png
 create mode 100644 res/drawable-xhdpi/undobar_divider.9.png
 create mode 100644 res/drawable/undobar_button.xml
 create mode 100644 res/values/integers.xml
 create mode 100644 src/de/danoeh/antennapod/util/UndoBarController.java

diff --git a/res/drawable-xhdpi/ic_undobar_undo.png b/res/drawable-xhdpi/ic_undobar_undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..91c8429adb6082b8f94f4ed791fe8d7481b0178b
GIT binary patch
literal 1558
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;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;4cCMIX*fdn+c
zI(&VtJoAc667!N%JzZ>-fM)1rW~Nw~nwyv#Te>;A8k$)c8oC-<x>*=oxH(yv8ydJ7
zIlDQ*^t$9Hm*%GCmB93-AoM!n)C)=sxdlL*T~doO%TiO^it=+6z@E0s#NrlXOLI#%
zBR4modFI&N0@0g-#VugH#s&sB_38s1qYsK&q^O1o0n-nN2~W5{4m|0n<^j`t5intE
z-95?8z`)eu>EaktaqG=Z&kPYqk%oseEjp@ABs!$o96J^T1}HYEe_c=>$ltVJksPaY
z(Fxs0nhydCoC6M41g=-o<ERo43|y?BcVx#TXQN}RJ<I;e?`gF2DZTz>$@0|&ay1ja
zoN1|wjm=*b_sLP<Nljndoacf53+6evarzwg6c;+7zQRenfOYlL&->0EsI$3r&{~l7
z^!Kv|HQ$uw^4?I{!1y=f*=?n1&vy%dkCm;t!ejE7Y1`2nyLC)8$1Um>cL>%Tt=@B#
zVcw(DDPaqBceG5Cx_2UcNB8O-Ydvqbsx08L=-cnO?W5%08S+xI1Ak0UZj3f;^7Gl~
zyMXboM7hqy>I_5GfIQxk2S!n{T4w7viZ*YH?%Zk7EL-S$porn~g^t#UCbKmM)z(&+
zee}8i|Lm5I)0Qps1uxHDJ?YMY(iev}9DQ73mc=_`&7sdzgg9pR&6^=@*4XDIEMQz<
z^_0ac?2)gF(Dg|w0h_pwP7xO9HcatwSoNgoQnmJ7ztffpx^l~6O6?Njk9<q7HdWtL
z9>x1B$nTL_o@CtZh_@4izG=mpuJ|v`d;NBe<(2z}G4WAnXYN>*UiL?`cyafy)YpG_
zPTZB%F0S3C-ydLSb0eVV=Ol;Ki9L(=scg7eP<x@B<;h3OoQm87?JRsrwK0{YTYKJJ
z(cieT&F}c4OFIv2mCU%btZ;wg2chSO+oi<Q7A&aN&WwI{@XQRm$vMh)VYj4xrFyMS
zv#x!9)@vKn>8}x*=YQ&)-e0a_Q!$$*CQ3oQVBMs9E3^$8^JIK)%{^xn_lQAG<)vS`
z<fRXHyT7eCxZ8wzQ)*q0^p17*(bG3<Ne=05yz)+7;+Q&5X814Gc@M%bN!duw-F{}#
kzy5bsO#iEy{<BChT*>~`u+Kzh9;l@DboFyt=akR{0M4*YumAu6

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/undobar.9.png b/res/drawable-xhdpi/undobar.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..22fa2205b30d97b1dcd396bbb23cbfc0ea763627
GIT binary patch
literal 1665
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yL!3HFEsI3eHQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07??9MLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&saCvz|c^^%uLVF
z#MI2pP)EVYz|ctF0Eo<V4Na^}&8&>f6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(
zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}N%^HE
zwn{*kLcEY$;Oh%FIIkEQP{1J5uShJ=H`FuG&&>t-3#_`hBq$Z(46Le)Ln;eW^@CE2
z^Gl18f$@>14ATq@JNy=b6armi<zJKujFiM2m;B_?+|;}hPZwJypp0HhW{Q=8p#?A$
z%}or<jSS2z41qigV@D%10}~S?6H7-IBbXW3^cq{5Te=y!Il3B}nHw6q8d|zp7+bhG
zS(qCdxEVRSIl=UL<`tJD<|U`X?9Bw)3)O3hSFe?GQEFmIeo;t%ehw@J1Z3ow<QHe;
z7brLfn<;4cCMIX*fdn)`5d`tCOKMSOS!#+~QGTuhIE1Y-vADp%k&w?JdQ->=HGQCC
z^g+o3DY?LefN2oKgeQI=2cCUW^MHA#2$(sxR+nWlFfgt6ba4!+xOHaw*}TgR0>}66
z{>P!Zr6Zazrr6;T=MF)Zc8^Nd0DT*V^9Px~Tx#zS;Z)pF^q^~sv)|MSljaD-7yivn
zTXQpO&$n%gg&NwuNxQ$+*Zr%0BiX%4XKw5?fkkCXFFNLy++uK;)6Mz#`ki%!TXLrJ
zY?^pxtBRP;l8yR#3<irY+>V;p9AlZFGF>FgM$Z0o?f($3pAz5tx0RUbbUpH(r1E_8
z%{R<%p0g}U)Z*CFtJdJxcW%ezlTUh|SFWFH8#ZfM`sJ5jbaT=~Sf8$ESfaYqT&j28
z``I$$Sq;~?@2KQ@YHA-}8W<sU;QjaC>*w@|W$bnF<+~8pQV}4SxnN4w6;Xyv)|CD0
z*xRiatdA26;g_*`#nrH-YRTFi+?O6Tyf4{bb1CePn8)Lt`?U@+GgP?oMsx?v(qGXx
z?erIEz8QKem>D!aztU#N(z?Ab>-(ys+hi_%>Ti$Y&3$?2)2>>E+X@?BFSyjo9QsV>
z^rLl?4Ax#^yC9)*$Y9S4u7u4uV<Ot7&SI`<IywFHQ|lK`tL+6>G)ArAoO*{-*uh`-
zW{utdJ#p*ry9cU#w)vkeV8edimG?^0VUL51t2#O2+$P<-dSl}|CmCm(h8^}YeDitO
znwL8Y*tBfSSuMx-I6~_9$Lm+Kz7}qbsA+P(uei_g&k<`T!G)G5PBO;4iYQlj=Qt-o
zMmS{s+Syx03j7`ksvcfquTke1<D_y+@cIV(<@O0z+t#SRNVdz?SS#*7QGg-q&$9b7
zN-A`(?3(Afe)1C)i3!Y?G9Lf=c!@z%b<dI~ireS<9^-9j(qI+#@jQ_%eAain!s5?D
zOr1O4?%{|vTWrnKz^r=AKv7qAv&npwrU(1CZoHEzX|scSmzs!U%=9~K6E|nrH1*~m
zcCMfGas8tI&mM>TS-r0O?t&dxzt@Xj4!C{vpI`#RBBSt)x1+@vL6w51tDnm{r-UW|
Dr228G

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/undobar_button_focused.9.png b/res/drawable-xhdpi/undobar_button_focused.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..d284ca7cbc8657e8150cbf4dfbb5e7d760b08504
GIT binary patch
literal 1141
zcmbVMO-$2J9Iu&xA|#p^9UMqgqCw;OwXNGKbB>kC5(djya1dkY+6Qa4e%QXTv4cVI
zBd8Z6Cr>0?JP{7Yix>_{6i=F9V)SC<=7oa?IbiU0ALs!&*tC7`{rms@{@<NT3|wh#
zZg0jgtTomrB++`xevUMv_v>f*i)d+sy=ge4kHey90xT@+8Gy%BaRMZPC{Nv32i+Lv
z$SSEcOvn3qNmohH)*(x(fzTM%9V!{3lmigYfC)tl5?e1;30#qb#8q#cjvEn>Rr<;%
z7%C5>q;gIQ$VBK8-d*AmfeN6Am(;vw@ueV9;pNfZ7E=UXQGvN2QFSUEPv8;V1h|)U
zyCj-naE>DxkC)?^3ph(NEJdT6b1@#?%kiuauU!PPX3FDyQi#@Up;M5^LTK<5RV)_C
zqMOvs35p2>0yYQBx{!v;n$n<Ha%om)ok0MWWGV(!bPcx|#f)BnK>~SN4M8>H@jYVA
zswE1gj4Fu+#gH_ms&-rzZ3`yBA2;^Zwo+3DppwAS3#NqXG2U4Rqud>A$W}z&@Pnp;
ziX!F(T`H(RgE1jUpf9AX$UM#XQ5Jn3+Q-tIpFt<TJIr#l$HRI8VS%l4?1%OGJU(}r
zcK0$ivX==&{ceA>$M0k4C>x3P)Uh$mf}$pYx?Kg?tzp>%v3$e?BGk>4uIK9=kjUy#
zx3ao{M}|1OD=tckW(&^Q1**m?08^O+a@5pSypmyF*~bGP>t-S>E6|aDMP9|q|C2Qe
zIYZg)@mIUlMW_eu?OyYv!`}D+4b6;+hU3S_FE`O(Eyjd!s`NRtv%4E|@ME$pV{;DW
zWNg9N>3B4KLY`iKKH+YA+Z4LBedzdBVDn7j==bH_{+4;iBtG2qEx+LSCC*%E*=V?a
z`PJ5}v%h7diQK-na_8{u?dea=bJU>g^lD_&dVjvlna$DVv(6o|quls7x%}`h!;G}Q
zbgqpIZzsk+I7S=RI!2u<t-}uziwkd_KKWYcXnl7qI*mE7pDC(*@BY%f{UeC=4hTy<
HV>7=2KO$=J

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/undobar_button_pressed.9.png b/res/drawable-xhdpi/undobar_button_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e990659f02242a1b24fb6b22cdbd81470449d116
GIT binary patch
literal 1123
zcmbVLPfXKL7%y2ELLkvd5b$7AVxoq%ecje=l{v<`$qYj>7Tn3uwGY;?{;_>yg%iTT
z5KRmT2fYwfj>dQ(UOW(^2jL<Iyl^rSFJ3V5;z5J2Y(o#o!KUqd-}k=X@B8z<Z*gS!
zdRt3(3qcTV=|M4z*ADkP<;DMZ>!quB=|ago8Z{<RMY13fSBwHA)0#91vrtlI?rg$7
zg76g8Tpr~!LxOB*wB*{*j%H#sLG;BOQ<A43A`5U*)uYt@>kW!jl_+&9m|-(!0v6T5
zSqqNN4(H_ADLJB0v1??XBVYmzB8hagl5Pu5lse=U@ZME36nSWZrlM3esC;IGOc)j<
zgS6i#vjC7hPlG^^=Rq&Yv4CS({PI2!5Q4nGg~-}NVQ-c)A!Nl=%@>xUR1qOlV3<m!
zLRb8>VNEh15{bAR9OuIpK6^$-lH=3uo;rgFZP`*yq#8QuGD-!bjG`2dw3>ouW->>_
zx?L+2E*axUCIe`e(KI)&Lu(sl;h!*$wYGCJCS<bEHp-Ta?_;8;4#u@R*^z6AqY-Xe
zD!vq{BpPyAgE~r!Q3{{XimC`K2;(Y-0&Iw5`7ppz*dOP3HW1(fk+{g!IgZ2n#YE5_
zj&Mo9#{o!!NGj|Prv}0yz^1rFYM_oy>o$^f8P@%(*l!JsQ72%9gasvJSUJNe)jMFM
zXduHb8YY<-<;hDKNmg}NaoN3~YQ7@0)M==sEJGs?D=etTL=fWqAi;4WoA_7eRjl$q
zRby~4jN2Z6wM$)vd(hn;H9r=P#s}(nW-L4$Ym3=EJXlL<F`jdF3qKDIVjf{!Q50g)
zqqe74J9|7!b7z#f%~zBDuJ=u`yFVIE???77mYcu6JQ!+S_DqvwO`l7vo?p^@Z|hFu
z?f$p>3!Ou)J5BUDmtPt4+S^;>-rep8E6v`G`}bDfthM((lZJ-Djk60Ewzob-*IDQM
q^A71r_R-T^=9}=)`=zm`f3AUe{M~ou+=u0l?%1c3!{Up9@%i8L!(;XU

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/undobar_divider.9.png b/res/drawable-xhdpi/undobar_divider.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b067d4e7d2104b04b3181c241d1063cdaf528f0
GIT binary patch
literal 963
zcmaJ=O^?z*7%q!3n`JjK@gl~<q`L<-(lUh>+EB?tsY|jY1TafHS=s>_ww>AzQaBmo
zL2v#9vx!Ij0ebMfXK(%q6HjY2!6^%@2eD~8GjE>fc|Ye(v+-ze=k^Z6FnjeQtwq;s
z^xNIOPXD#DJ2&Z)CbceU<35>~0b&kq+(V%5ngi5AragUjj!F!ZJa9T)(lw413%i^d
zW4OrmDVt$R<;XX!5h9?629Bq)-#>q0fn%%eiD+aEzlw&=(JVmiS)*gkMwV=|<%ggY
zDOA8k!~~Ih>V-<AvI|{>?qf60f(3+(RQ58cuF(Wl93UWaxr~*C5J(aS^P(id2SCU|
zfzQ%c%D}uLN{Ubb%ZH`j0=uuYG=1rdo>X>7h_CScWHR9<ISvN{9?G&DYY0MyA~NCB
zBW9HG!u^$khC(ZFeBxja#ENDQkBQ3CNH0@x{k5zYF3Us<#z&^lLoOSqv;rE&|DmqC
zMu((@uHyZtaM+pph;N|~j{}P~uD>6<@|9|UOoD?B#;2<)HiwwtaEN_SZA;*;VOowC
z8}2O_hN0BGkeHr@>YB<@4bE|FMJ(hCIa#mOpj3pg24%gNE9#YE0cLffs#jKA4O?Ru
zd1S@4ueka~ZafUGPd#fWaGoPu53masNh{9gSgITKmRx&tEZRmcPlMs(*8bJ%m5I(z
zyj>42J*-C`d34?bI@s@@T>PMyLab|to#<QdVm>b?Z@hRt2U05e>hacDI-Q>9;Jd_e
p;;r!e{&tG_U>_K%<fpHRtzG8)*R9z}@241Ft9q@WeXKlv`3FLdC(-}_

literal 0
HcmV?d00001

diff --git a/res/drawable/undobar_button.xml b/res/drawable/undobar_button.xml
new file mode 100644
index 000000000..a4de91b49
--- /dev/null
+++ b/res/drawable/undobar_button.xml
@@ -0,0 +1,22 @@
+<!--
+
+  Copyright 2012 Roman Nurik
+
+  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.
+  
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/undobar_button_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/undobar_button_focused" android:state_focused="true"/>
+  <item android:drawable="@android:color/transparent"/>
+</selector>
diff --git a/res/layout/organize_queue.xml b/res/layout/organize_queue.xml
index b73263632..1c6a4ad4e 100644
--- a/res/layout/organize_queue.xml
+++ b/res/layout/organize_queue.xml
@@ -32,4 +32,9 @@
         android:gravity="center"
         android:text="@string/no_items_label" />
 
-</LinearLayout>
\ No newline at end of file
+    <LinearLayout android:id="@+id/undobar" style="@style/UndoBar">
+      <TextView android:id="@+id/undobar_message" style="@style/UndoBarMessage" />
+      <Button android:id="@+id/undobar_button" style="@style/UndoBarButton" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values/integers.xml b/res/values/integers.xml
new file mode 100644
index 000000000..d7f7eca68
--- /dev/null
+++ b/res/values/integers.xml
@@ -0,0 +1,3 @@
+<resources>
+  <integer name="undobar_hide_delay">5000</integer>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5bc40db54..fce513f3e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,6 +122,8 @@
     <!-- Queue operations -->
     <string name="clear_queue_label">Clear queue</string>
     <string name="organize_queue_label">Organize queue</string>
+    <string name="undo">Undo</string>
+    <string name="removed_from_queue">Item removed</string>
 
     <!-- Flattr -->
     <string name="flattr_auth_label">Flattr sign-in</string>
@@ -239,4 +241,4 @@
     <string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string>
     <string name="set_to_default_folder">Choose default folder</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c5e3abde3..f32ea3894 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -92,4 +92,42 @@
         <item name="android:textColor">#FFFFFF</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <style name="UndoBar">
+      <item name="android:layout_width">match_parent</item>
+      <item name="android:layout_height">48dp</item>
+      <item name="android:layout_gravity">bottom</item>
+      <item name="android:layout_marginLeft">8dp</item>
+      <item name="android:layout_marginRight">8dp</item>
+      <item name="android:layout_marginBottom">16dp</item>
+      <item name="android:orientation">horizontal</item>
+      <item name="android:background">@drawable/undobar</item>
+      <item name="android:clickable">true</item>
+      <item name="android:showDividers">middle</item>
+      <item name="android:divider">@drawable/undobar_divider</item>
+      <item name="android:dividerPadding">10dp</item>
+    </style>
+    <style name="UndoBarMessage">
+      <item name="android:layout_width">0dp</item>
+      <item name="android:layout_weight">1</item>
+      <item name="android:layout_height">wrap_content</item>
+      <item name="android:layout_marginLeft">16dp</item>
+      <item name="android:layout_gravity">center_vertical</item>
+      <item name="android:layout_marginRight">16dp</item>
+      <item name="android:textAppearance">?android:textAppearanceMedium</item>
+      <item name="android:textColor">#fff</item>
+    </style>
+    <style name="UndoBarButton">
+      <item name="android:layout_width">wrap_content</item>
+      <item name="android:layout_height">match_parent</item>
+      <item name="android:paddingLeft">16dp</item>
+      <item name="android:paddingRight">16dp</item>
+      <item name="android:background">@drawable/undobar_button</item>
+      <item name="android:drawableLeft">@drawable/ic_undobar_undo</item>
+      <item name="android:drawablePadding">12dp</item>
+      <item name="android:textAppearance">?android:textAppearanceSmall</item>
+      <item name="android:textAllCaps">true</item>
+      <item name="android:textStyle">bold</item>
+      <item name="android:textColor">#fff</item>
+      <item name="android:text">@string/undo</item>
+    </style>
+</resources>
diff --git a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
index 89001f7f5..dfb569a22 100644
--- a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
+++ b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
@@ -3,6 +3,8 @@ package de.danoeh.antennapod.activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,13 +23,15 @@ import de.danoeh.antennapod.feed.EventDistributor;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.util.UndoBarController;
 
-public class OrganizeQueueActivity extends SherlockListActivity {
+public class OrganizeQueueActivity extends SherlockListActivity implements UndoBarController.UndoListener {
 	private static final String TAG = "OrganizeQueueActivity";
 
 	private static final int MENU_ID_ACCEPT = 2;
 
 	private OrganizeAdapter adapter;
+	private UndoBarController undoBarController;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -41,6 +45,8 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 
 		adapter = new OrganizeAdapter(this);
 		setListAdapter(adapter);
+
+		undoBarController = new UndoBarController(findViewById(R.id.undobar), this);
 	}
 
 	@Override
@@ -82,8 +88,10 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		@Override
 		public void remove(int which) {
 			FeedManager manager = FeedManager.getInstance();
-			manager.removeQueueItem(OrganizeQueueActivity.this,
-					(FeedItem) getListAdapter().getItem(which));
+			FeedItem item = (FeedItem) getListAdapter().getItem(which);
+			manager.removeQueueItem(OrganizeQueueActivity.this, item);
+			undoBarController.showUndoBar(false, getString(R.string.removed_from_queue),
+					new UndoItem(item, which));
 		}
 	};
 
@@ -110,6 +118,17 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		}
 	}
 
+	@Override
+	public void onUndo(Parcelable token) {
+		// Perform the undo
+		UndoItem undoItem = (UndoItem) token;
+		FeedItem feedItem = undoItem.getFeedItem();
+		int position = undoItem.getPosition();
+
+		FeedManager manager = FeedManager.getInstance();
+		manager.addQueueItemAt(OrganizeQueueActivity.this, feedItem, position, false);
+	}
+
 	/**
 	 * WARNING: If the PlaybackService is playing an episode from the queue,
 	 * this list adapter will ignore the first item in the list to make sure
@@ -185,4 +204,53 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 
 	}
 
+	private static class UndoItem implements Parcelable {
+		private long itemId;
+		private long feedId;
+		private int position;
+
+		public UndoItem(FeedItem item, int position) {
+			FeedManager manager = FeedManager.getInstance();
+			this.itemId = item.getId();
+			this.feedId = item.getFeed().getId();
+			this.position = position;
+		}
+
+		private UndoItem(Parcel in) {
+			itemId = in.readLong();
+			feedId = in.readLong();
+			position = in.readInt();
+		}
+
+		public static final Parcelable.Creator<UndoItem> CREATOR
+			= new Parcelable.Creator<UndoItem>() {
+				public UndoItem createFromParcel(Parcel in) {
+					return new UndoItem(in);
+				}
+
+				public UndoItem[] newArray(int size) {
+					return new UndoItem[size];
+				}
+			};
+
+		public int describeContents() {
+			return 0;
+		}
+
+		public void writeToParcel(Parcel out, int flags) {
+			out.writeLong(itemId);
+			out.writeLong(feedId);
+			out.writeInt(position);
+		}
+
+		public FeedItem getFeedItem() {
+			FeedManager manager = FeedManager.getInstance();
+			return manager.getFeedItem(itemId, feedId);
+		}
+
+		public int getPosition() {
+			return position;
+		}
+	}
+
 }
diff --git a/src/de/danoeh/antennapod/util/UndoBarController.java b/src/de/danoeh/antennapod/util/UndoBarController.java
new file mode 100644
index 000000000..e726717a1
--- /dev/null
+++ b/src/de/danoeh/antennapod/util/UndoBarController.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2012 Roman Nurik
+ *
+ * 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.
+ */
+
+package de.danoeh.antennapod.util;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
+import android.widget.TextView;
+
+import de.danoeh.antennapod.R;
+
+public class UndoBarController {
+    private View mBarView;
+    private TextView mMessageView;
+    private ViewPropertyAnimator mBarAnimator;
+    private Handler mHideHandler = new Handler();
+
+    private UndoListener mUndoListener;
+
+    // State objects
+    private Parcelable mUndoToken;
+    private CharSequence mUndoMessage;
+
+    public interface UndoListener {
+        void onUndo(Parcelable token);
+    }
+
+    public UndoBarController(View undoBarView, UndoListener undoListener) {
+        mBarView = undoBarView;
+        mBarAnimator = mBarView.animate();
+        mUndoListener = undoListener;
+
+        mMessageView = (TextView) mBarView.findViewById(R.id.undobar_message);
+        mBarView.findViewById(R.id.undobar_button)
+                .setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        hideUndoBar(false);
+                        mUndoListener.onUndo(mUndoToken);
+                    }
+                });
+
+        hideUndoBar(true);
+    }
+
+    public void showUndoBar(boolean immediate, CharSequence message, Parcelable undoToken) {
+        mUndoToken = undoToken;
+        mUndoMessage = message;
+        mMessageView.setText(mUndoMessage);
+
+        mHideHandler.removeCallbacks(mHideRunnable);
+        mHideHandler.postDelayed(mHideRunnable,
+                mBarView.getResources().getInteger(R.integer.undobar_hide_delay));
+
+        mBarView.setVisibility(View.VISIBLE);
+        if (immediate) {
+            mBarView.setAlpha(1);
+        } else {
+            mBarAnimator.cancel();
+            mBarAnimator
+                    .alpha(1)
+                    .setDuration(
+                            mBarView.getResources()
+                                    .getInteger(android.R.integer.config_shortAnimTime))
+                    .setListener(null);
+        }
+    }
+
+    public void hideUndoBar(boolean immediate) {
+        mHideHandler.removeCallbacks(mHideRunnable);
+        if (immediate) {
+            mBarView.setVisibility(View.GONE);
+            mBarView.setAlpha(0);
+            mUndoMessage = null;
+            mUndoToken = null;
+
+        } else {
+            mBarAnimator.cancel();
+            mBarAnimator
+                    .alpha(0)
+                    .setDuration(mBarView.getResources()
+                            .getInteger(android.R.integer.config_shortAnimTime))
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            mBarView.setVisibility(View.GONE);
+                            mUndoMessage = null;
+                            mUndoToken = null;
+                        }
+                    });
+        }
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putCharSequence("undo_message", mUndoMessage);
+        outState.putParcelable("undo_token", mUndoToken);
+    }
+
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            mUndoMessage = savedInstanceState.getCharSequence("undo_message");
+            mUndoToken = savedInstanceState.getParcelable("undo_token");
+
+            if (mUndoToken != null || !TextUtils.isEmpty(mUndoMessage)) {
+                showUndoBar(true, mUndoMessage, mUndoToken);
+            }
+        }
+    }
+
+    private Runnable mHideRunnable = new Runnable() {
+        @Override
+        public void run() {
+            hideUndoBar(false);
+        }
+    };
+}