From f1b77bf3715b7a28cf4a9afd5f47b3e20d50ca36 Mon Sep 17 00:00:00 2001
From: Artur Dryomov <artur.dryomov@gmail.com>
Date: Mon, 29 Jul 2013 04:09:29 +0300
Subject: [PATCH] Add timer support.

Show the timer as a dialog, plus update all following information as it
should be.

Change-Id: Idae00b009ce098cfd482ec79629fc8f674502c9a
---
 .../res/drawable-hdpi/ic_action_timer.png     | Bin 0 -> 1794 bytes
 .../res/drawable-mdpi/ic_action_timer.png     | Bin 0 -> 1408 bytes
 .../res/drawable-xhdpi/ic_action_timer.png    | Bin 0 -> 2284 bytes
 .../res/menu/menu_action_bar_slide_show.xml   |  27 +++
 .../menu/menu_action_bar_slide_show_grid.xml  |  10 --
 .../menu/menu_action_bar_slide_show_pager.xml |  10 --
 android/sdremote/res/values/strings.xml       |  10 ++
 android/sdremote/res/values/themes.xml        |   2 +-
 .../activity/ComputersActivity.java           |   2 +-
 .../activity/SlideShowActivity.java           | 155 +++++++++++++++---
 .../communication/CommunicationService.java   |  10 +-
 .../communication/SlideShow.java              |   4 +-
 .../impressremote/communication/Timer.java    | 138 ++++++----------
 .../fragment/TimerEditingDialog.java          | 136 +++++++++++++++
 .../fragment/TimerSettingDialog.java          |  72 ++++++++
 .../impressremote/util/FragmentOperator.java  |  24 ++-
 .../impressremote/util/Intents.java           |  29 ++++
 17 files changed, 486 insertions(+), 143 deletions(-)
 create mode 100755 android/sdremote/res/drawable-hdpi/ic_action_timer.png
 create mode 100755 android/sdremote/res/drawable-mdpi/ic_action_timer.png
 create mode 100755 android/sdremote/res/drawable-xhdpi/ic_action_timer.png
 create mode 100644 android/sdremote/res/menu/menu_action_bar_slide_show.xml
 delete mode 100644 android/sdremote/res/menu/menu_action_bar_slide_show_grid.xml
 delete mode 100644 android/sdremote/res/menu/menu_action_bar_slide_show_pager.xml
 create mode 100644 android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
 create mode 100644 android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java

diff --git a/android/sdremote/res/drawable-hdpi/ic_action_timer.png b/android/sdremote/res/drawable-hdpi/ic_action_timer.png
new file mode 100755
index 0000000000000000000000000000000000000000..314ec9319a071bf3743105057fe07e7283cf7b89
GIT binary patch
literal 1794
zcmaJ?c~BEq99|*;L{Jdq5_KoQpkT7QF#!_^3Q3TNK@2DXswE@~1d{BsS%lz)P(c~+
zLZ=*B6?H~SL_i0@6GufsKs&aGM=_(Lc$Gt`2i4k*0``y6o!Ncw{pS0=-}z>@Mnx{R
zxAm|E0Ki@nE|O6zY<_L5sBbLoLm{=elVUj;jU|&=3IYW}R9F%UO0<d;RE8>4hKyD;
z2mmH{t7GJ(T)LF6#I!7h8N<rf;uISIf)-}u3S~M<f=OtKS|?!ipS{Qc)hYoamMev&
zxDZWMhvyJzbWUW9GACWhQ!y3>gF)GRN<fQ}3NTx%(dqfw0>&3zKD9TSAqMybLZ%BC
zUxSiMqd*}>pdgn8GnH@v0tRqc2nXhIcymEEjKC1WhTuRZ0`s|nd>8>o9tP!&P$lza
zqOcKP)JecdB}tqQL0MT@tgLw~j7WhH9*+mXY>3TfQV6Erpd%I8Or73qR6&I5m4q56
z)tC-6D=Lz(Oj5w0BK?|z79W$<=|{>$6%5K&;1I%s%_)rnrPBY0YPDl%Jt;%K#rvPa
z`WOR_LNZj3WfDrNamik0S2$ltpb8QrVlYfITE(bTjKuV*7!C@fxhw>fDwJxS+46-U
zmGUJzJ*m(sQHe;vpfp%&wTdqa<b;Uk!w5GN4nq(z!s8%3F(*_Q62?UWIibiXSA;1u
zwWy99<*L4M+2eA}!=S|}&mxpiuR&E|1f~VQB+XZk7fWDR*tmKlT-Eroz~gcuDj3Mz
z+JCir)I`mXc{?_^)M0G&Q5`k!1U1;!{;M8P_l2rJNKE#<SLF*+qnA6k{I#ngN|GRT
z^7l*gJ;*#p&fYS^*|KEvnkdKnk~2pm=++sI*5Z(ix>8e>Pu|9(`9-CZ9YYSLs$ZBK
zrqR<m@`R!;&ftOpI_sdcPpb0}KHM~`WB-r(o_Bpsy*>JuDt38ATEH^to=X4bX(n5o
z9@CY^9RAt*{vw-Gn?QL-|AsuvE%_M(R_&i58qEZBPiX*V;fwlg%Rgyc)&bj_g#+hz
zn<BUR4?5y@8Y{Jlu21yvzBFa^9ookO?nc_Ar4P58tQyZgpm_^Ab8BDUbsg|L2RNBr
zZ(mX5aPuN-C%m$pzI&&^j)iozu@YxATAc|gnuE~#a<PiwE@Ei7oY>W-G&#RdBLf-D
zxh@VC{nrH!@sIAojr4}zLD#D7#)~$})Q6=K_dN%LZ}>tkbl<oYE+>yCLh}9Bdgref
zeYjAG>?Mp73d`Q?3MjSX?CH&slq_ujv@SsWed*AQ<hj+f!$o#}=)m5mKfJ+duJxAd
zJJ~IuGT!Nyb->{8eIt9b#{LGHpIkg~_$|D0Khxs1<-5Vwb;(zMSyg`9W6t4wHcFM-
z$)18-md;+aGpB{V<Qg^syMj3EP}xDsHFu|)9@|dmc2`|5{d_}w^Ga3mlaoFNN|r5O
z*;N+OdVIy|N_laeXA3KC(T-zaWsQ4B<<ZAIzE^h+c-WLFjK!VLp4+6Zd_52CPQUK0
zi&v#o+?2HirPrv0(bw31YB;KOo2FvpC#z4FJ>Lyy7H4>Pa%Tg7@9p-P7><Y1?b6O1
z?nLo@$T{b_#g9*y6hC=pe9NajYFD&AnS9xCrj_d@tY(sHb06*E^QfoN2L-vO9~=tz
z{VhRM5!M(NLCAix78q*!QDa<70|V@w*c8#a%xSG{L3ij9A(^>V+;-D#Qn6ax9F!2;
z+FJ6es;KUcY5rPZP)|SA``zuE{q@?X=j<(#4w;;Mdx5q0lU@ntTdb}>u901MdAOgm
zIPKRp5eB!Vd2WqU@(TVqx&#=S-Jd_?u1q)7dNPlAt`Ab|)1_ppnS{5hdZ6e;!t?5V
z7kn~j?ml#+9llj2V-^^u#u_(2^Gf)=#m(z{(zX?ChFb3B4d7WQ{zYPS!LcTdbwa~-
z7mOJ4BLd?8EIivJ{a8Qi#Dc!hTUS}s0I|9LiQ-A`eVc)vLZ{j;XtRU)uOtyiifTd=
G^Zo%Fg0y%5

literal 0
HcmV?d00001

diff --git a/android/sdremote/res/drawable-mdpi/ic_action_timer.png b/android/sdremote/res/drawable-mdpi/ic_action_timer.png
new file mode 100755
index 0000000000000000000000000000000000000000..a09df2b99c581835a832607283549ae1b8950e27
GIT binary patch
literal 1408
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(#^lGsViq+{Dqv!obwj$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY
zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zUfZG*%fP_+$<xI#
zq~g|_>HEEz5+#nm-y|P3$>rG8M$N5DJF~L|XPB6!eMxtzcMvc!*<y0-g@h{$-y-j3
ziKi<9ycKUenB+R4HvR`+(VhP9Z=Q(7|KPb-eg6Bt@4xKMf1Y>iZJDV4@s39yC8R#w
zIglZ5sJMY`TH~>7-wO=>3v4x*1vjv7J17+XzPq^Y19#j(-5o6NjTWs+kxDzL*wHAZ
z(V$hqoSeY7<RF_zgLnZ?Ue453M(Lsjj9LluEY;5z9k~A4`b4!>&&iuFZ`;~9FJ$s~
z`7F(WbB*+or4pAHxW%(QbDWt!*<eP0gZqX|q4^0pGo#whZ}d7W)6s1F@BJ@Dvw8eJ
zGmc!BkX}A*v6aB1W7TYxldJ!nS)|!L{Y0>`w{Ir1=evrHx2@H_`*=yb2vBwdifAjj
z&dlmM%k?8yXsy>;QFS(xUHOq5-J%lgm(AFsu3WnFj&=S6>68PjZlCqI@{NHb`iNaa
zumJ1xJ8#{Tebz1$W-bj>iHtjYj9<QnMeG3U@7B5{D?`hJx||nqymN3^6qDa5wSz6{
z{8t9kt}9dYTyo8XCR*(ls()&0!O;Dnh1V-FXHrz|^0Oz_iAYamvECIFb7^f?_Sq9$
z;j<?CSYLa*L-zl7hffE8-mK$SS=G!htnR)^d)_n=b6%b&0jv1z&$hAcG5er?fMG(0
VM0jf!w;-rY^mO%eS?83{1ORJ`_WA$-

literal 0
HcmV?d00001

diff --git a/android/sdremote/res/drawable-xhdpi/ic_action_timer.png b/android/sdremote/res/drawable-xhdpi/ic_action_timer.png
new file mode 100755
index 0000000000000000000000000000000000000000..c8771db9715876f0a72616036554e9002e506373
GIT binary patch
literal 2284
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

literal 0
HcmV?d00001

diff --git a/android/sdremote/res/menu/menu_action_bar_slide_show.xml b/android/sdremote/res/menu/menu_action_bar_slide_show.xml
new file mode 100644
index 000000000000..eaa2b3d0ea3c
--- /dev/null
+++ b/android/sdremote/res/menu/menu_action_bar_slide_show.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_slides_pager"
+        android:title="@string/menu_slides_pager"
+        android:icon="@drawable/ic_action_pager"
+        android:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_slides_grid"
+        android:title="@string/menu_slides_grid"
+        android:icon="@drawable/ic_action_grid"
+        android:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_timer"
+        android:title="@string/menu_timer"
+        android:icon="@drawable/ic_action_timer"
+        android:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/menu_stop_slide_show"
+        android:title="@string/menu_stop_slide_show"
+        android:showAsAction="never"/>
+
+</menu>
\ No newline at end of file
diff --git a/android/sdremote/res/menu/menu_action_bar_slide_show_grid.xml b/android/sdremote/res/menu/menu_action_bar_slide_show_grid.xml
deleted file mode 100644
index d65c782669e2..000000000000
--- a/android/sdremote/res/menu/menu_action_bar_slide_show_grid.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_slides_pager"
-        android:title="@string/menu_slides_pager"
-        android:icon="@drawable/ic_action_pager"
-        android:showAsAction="always"/>
-
-</menu>
\ No newline at end of file
diff --git a/android/sdremote/res/menu/menu_action_bar_slide_show_pager.xml b/android/sdremote/res/menu/menu_action_bar_slide_show_pager.xml
deleted file mode 100644
index 023dcd5e3301..000000000000
--- a/android/sdremote/res/menu/menu_action_bar_slide_show_pager.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_slides_grid"
-        android:title="@string/menu_slides_grid"
-        android:icon="@drawable/ic_action_grid"
-        android:showAsAction="always"/>
-
-</menu>
\ No newline at end of file
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index 16c1de821d6f..f315add6ce86 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="title_connection">Connection</string>
     <string name="title_creation">Creation</string>
     <string name="title_slide_show">Slide Show</string>
+    <string name="title_timer">Timer</string>
 
     <string name="menu_licenses">Open source licenses</string>
     <string name="menu_reconnect">Reconnect</string>
@@ -17,9 +18,13 @@
     <string name="menu_remove_computer">Remove</string>
     <string name="menu_slides_grid">Slides grid</string>
     <string name="menu_slides_pager">Slides pager</string>
+    <string name="menu_timer">Timer</string>
+    <string name="menu_stop_slide_show">Stop slide show</string>
 
     <string name="button_cancel">Cancel</string>
     <string name="button_save">Save</string>
+    <string name="button_start">Start</string>
+    <string name="button_reset">Reset</string>
 
     <string name="message_impress_pin_validation">Go to “Slide Show → Impress Remote” in LibreOffice Impress and enter the code.</string>
     <string name="message_connection_failed_title">Connection failed</string>
@@ -28,6 +33,7 @@
     <string name="message_impress_pairing_check">If you have Bluetooth pairing issues check instructions related to your desktop OS.</string>
     <string name="message_ip_address_validation">You should type a valid IP address.</string>
     <string name="message_name_notice">Name is optional — IP address would be used instead if you wish.</string>
+    <string name="message_time_is_up">Time is up</string>
 
     <string name="hint_ip_address">IP address</string>
     <string name="hint_name">Name</string>
@@ -35,5 +41,9 @@
     <string name="header_notes">Notes</string>
 
     <string name="mask_slide_show_progress">Slide %1$d from %2$d</string>
+    <plurals name="mask_timer_progress">
+        <item quantity="one">One minute left</item>
+        <item quantity="other">%d minutes left</item>
+    </plurals>
 
 </resources>
diff --git a/android/sdremote/res/values/themes.xml b/android/sdremote/res/values/themes.xml
index da70aa8e5776..20a4b2226722 100644
--- a/android/sdremote/res/values/themes.xml
+++ b/android/sdremote/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar">
+    <style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar.ForceOverflow">
         <item name="android:actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
         <item name="actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item>
 
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
index 3fa617339b6d..2dd3b0b994b3 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -110,7 +110,7 @@ public class ComputersActivity extends SherlockFragmentActivity implements Actio
     private void setUpComputersList() {
         Fragment aComputersFragment = ComputersFragment.newInstance(ComputersFragment.Type.WIFI);
 
-        FragmentOperator.setUpFragment(this, aComputersFragment);
+        FragmentOperator.addFragment(this, aComputersFragment);
     }
 
     @Override
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
index 4b91a6af8f65..06967d1be6fd 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -16,8 +16,8 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.LocalBroadcastManager;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
@@ -26,8 +26,12 @@ import com.actionbarsherlock.view.MenuItem;
 import org.libreoffice.impressremote.R;
 import org.libreoffice.impressremote.communication.CommunicationService;
 import org.libreoffice.impressremote.communication.SlideShow;
+import org.libreoffice.impressremote.communication.Timer;
 import org.libreoffice.impressremote.fragment.SlidesGridFragment;
 import org.libreoffice.impressremote.fragment.SlidesPagerFragment;
+import org.libreoffice.impressremote.fragment.TimerEditingDialog;
+import org.libreoffice.impressremote.fragment.TimerSettingDialog;
+import org.libreoffice.impressremote.util.FragmentOperator;
 import org.libreoffice.impressremote.util.Intents;
 
 public class SlideShowActivity extends SherlockFragmentActivity implements ServiceConnection {
@@ -57,7 +61,7 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private void setUpFragment() {
-        setUpFragment(buildFragment());
+        FragmentOperator.replaceFragmentAnimated(this, buildFragment());
     }
 
     private Fragment buildFragment() {
@@ -73,15 +77,6 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
         }
     }
 
-    private void setUpFragment(Fragment aFragment) {
-        FragmentTransaction aTransaction = getSupportFragmentManager().beginTransaction();
-        aTransaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
-
-        aTransaction.replace(android.R.id.content, aFragment);
-
-        aTransaction.commit();
-    }
-
     private void bindService() {
         Intent aIntent = Intents.buildCommunicationServiceIntent(this);
         bindService(aIntent, this, Context.BIND_AUTO_CREATE);
@@ -124,6 +119,30 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
         public void onReceive(Context aContext, Intent aIntent) {
             if (Intents.Actions.SLIDE_CHANGED.equals(aIntent.getAction())) {
                 mSlideShowActivity.setUpSlideShowInformation();
+                return;
+            }
+
+            if (Intents.Actions.TIMER_UPDATED.equals(aIntent.getAction())) {
+                mSlideShowActivity.setUpSlideShowInformation();
+                return;
+            }
+
+            if (Intents.Actions.TIMER_STARTED.equals(aIntent.getAction())) {
+                int aMinutesLength = aIntent.getIntExtra(Intents.Extras.MINUTES, 0);
+                mSlideShowActivity.startTimer(aMinutesLength);
+                return;
+            }
+
+            if (Intents.Actions.TIMER_RESUMED.equals(aIntent.getAction())) {
+                mSlideShowActivity.resumeTimer();
+                return;
+            }
+
+            if (Intents.Actions.TIMER_CHANGED.equals(aIntent.getAction())) {
+                int aMinutesLength = aIntent.getIntExtra(Intents.Extras.MINUTES, 0);
+                mSlideShowActivity.changeTimer(aMinutesLength);
+                mSlideShowActivity.resumeTimer();
+                mSlideShowActivity.setUpSlideShowInformation();
             }
         }
     }
@@ -131,6 +150,10 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     private IntentFilter buildIntentsReceiverFilter() {
         IntentFilter aIntentFilter = new IntentFilter();
         aIntentFilter.addAction(Intents.Actions.SLIDE_CHANGED);
+        aIntentFilter.addAction(Intents.Actions.TIMER_UPDATED);
+        aIntentFilter.addAction(Intents.Actions.TIMER_STARTED);
+        aIntentFilter.addAction(Intents.Actions.TIMER_RESUMED);
+        aIntentFilter.addAction(Intents.Actions.TIMER_CHANGED);
 
         return aIntentFilter;
     }
@@ -148,6 +171,10 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
         getSupportActionBar().setSubtitle(buildSlideShowTimerProgress());
     }
 
+    private boolean isServiceBound() {
+        return mCommunicationService != null;
+    }
+
     private String buildSlideShowProgress() {
         SlideShow aSlideShow = mCommunicationService.getSlideShow();
 
@@ -158,7 +185,38 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private String buildSlideShowTimerProgress() {
-        return null;
+        Timer aTimer = mCommunicationService.getSlideShow().getTimer();
+
+        if (!aTimer.isSet()) {
+            return null;
+        }
+
+        if (aTimer.isTimeUp()) {
+            return getString(R.string.message_time_is_up);
+        }
+
+        int aMinutesLeft = aTimer.getMinutesLeft();
+
+        return getResources().getQuantityString(R.plurals.mask_timer_progress, aMinutesLeft, aMinutesLeft);
+    }
+
+    private void startTimer(int aMinutesLength) {
+        Timer aTimer = mCommunicationService.getSlideShow().getTimer();
+
+        aTimer.setMinutesLength(aMinutesLength);
+        aTimer.start();
+
+        setUpSlideShowInformation();
+    }
+
+    private void resumeTimer() {
+        mCommunicationService.getSlideShow().getTimer().resume();
+    }
+
+    private void changeTimer(int aMinutesLength) {
+        Timer aTimer = mCommunicationService.getSlideShow().getTimer();
+
+        aTimer.setMinutesLength(aMinutesLength);
     }
 
     @Override
@@ -170,27 +228,42 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
 
     @Override
     public boolean onCreateOptionsMenu(Menu aMenu) {
-        getSupportMenuInflater().inflate(getActionBarMenuResourceId(), aMenu);
+        getSupportMenuInflater().inflate(R.menu.menu_action_bar_slide_show, aMenu);
 
         return true;
     }
 
-    private int getActionBarMenuResourceId() {
+    @Override
+    public boolean onPrepareOptionsMenu(Menu aMenu) {
+        MenuItem aSlidesPagerMenuItem = aMenu.findItem(R.id.menu_slides_pager);
+        MenuItem aSlidesGridMenuItem = aMenu.findItem(R.id.menu_slides_grid);
+
         switch (mMode) {
             case PAGER:
-                return R.menu.menu_action_bar_slide_show_pager;
+                aSlidesPagerMenuItem.setVisible(false);
+                aSlidesGridMenuItem.setVisible(true);
+                break;
 
             case GRID:
-                return R.menu.menu_action_bar_slide_show_grid;
+                aSlidesPagerMenuItem.setVisible(true);
+                aSlidesGridMenuItem.setVisible(false);
+                break;
 
             default:
-                return R.menu.menu_action_bar_slide_show_pager;
+                break;
         }
+
+        return super.onPrepareOptionsMenu(aMenu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem aMenuItem) {
         switch (aMenuItem.getItemId()) {
+            case android.R.id.home:
+                navigateUp();
+
+                return true;
+
             case R.id.menu_slides_grid:
                 mMode = Mode.GRID;
 
@@ -207,8 +280,13 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
 
                 return true;
 
-            case android.R.id.home:
-                navigateUp();
+            case R.id.menu_timer:
+                callTimer();
+
+                return true;
+
+            case R.id.menu_stop_slide_show:
+                stopSlideShow();
 
                 return true;
 
@@ -217,11 +295,38 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
         }
     }
 
+    private void navigateUp() {
+        finish();
+    }
+
     private void refreshActionBarMenu() {
         supportInvalidateOptionsMenu();
     }
 
-    private void navigateUp() {
+    private void callTimer() {
+        Timer aTimer = mCommunicationService.getSlideShow().getTimer();
+
+        if (aTimer.isSet()) {
+            int aTimerLength = aTimer.getMinutesLeft();
+
+            DialogFragment aFragment = TimerEditingDialog.newInstance(aTimerLength);
+            aFragment.show(getSupportFragmentManager(), TimerEditingDialog.TAG);
+
+            pauseTimer();
+        }
+        else {
+            DialogFragment aFragment = TimerSettingDialog.newInstance();
+            aFragment.show(getSupportFragmentManager(), TimerSettingDialog.TAG);
+        }
+    }
+
+    private void pauseTimer() {
+        mCommunicationService.getSlideShow().getTimer().pause();
+    }
+
+    private void stopSlideShow() {
+        mCommunicationService.getTransmitter().stopPresentation();
+
         finish();
     }
 
@@ -245,11 +350,17 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     protected void onDestroy() {
         super.onDestroy();
 
+        stopTimer();
+
         disconnectComputer();
 
         unbindService();
     }
 
+    private void stopTimer() {
+        mCommunicationService.getSlideShow().getTimer().stop();
+    }
+
     private void disconnectComputer() {
         if (!isServiceBound()) {
             return;
@@ -258,10 +369,6 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
         mCommunicationService.disconnect();
     }
 
-    private boolean isServiceBound() {
-        return mCommunicationService != null;
-    }
-
     private void unbindService() {
         if (!isServiceBound()) {
             return;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 2977921f25a9..6041190f5857 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -19,7 +19,7 @@ import android.support.v4.content.LocalBroadcastManager;
 
 import org.libreoffice.impressremote.util.Intents;
 
-public class CommunicationService extends Service implements Runnable, MessagesListener {
+public class CommunicationService extends Service implements Runnable, MessagesListener, Timer.TimerListener {
     public static enum State {
         DISCONNECTED, SEARCHING, CONNECTING, CONNECTED
     }
@@ -58,7 +58,7 @@ public class CommunicationService extends Service implements Runnable, MessagesL
 
         mServersManager = new ServersManager(this);
 
-        mSlideShow = new SlideShow();
+        mSlideShow = new SlideShow(new Timer(this));
 
         mThread = new Thread(this);
         mThread.start();
@@ -278,6 +278,12 @@ public class CommunicationService extends Service implements Runnable, MessagesL
         LocalBroadcastManager.getInstance(this).sendBroadcast(aIntent);
     }
 
+    @Override
+    public void onTimerUpdated() {
+        Intent aIntent = Intents.buildTimerUpdatedIntent();
+        LocalBroadcastManager.getInstance(this).sendBroadcast(aIntent);
+    }
+
     @Override
     public void onDestroy() {
         stopSearch();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 0b9b1d6dc61a..f6aa6dd1b40e 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
@@ -20,14 +20,14 @@ public class SlideShow {
 
     private final Timer mTimer;
 
-    public SlideShow() {
+    public SlideShow(Timer aTimer) {
         this.mSlidesCount = 0;
         this.mCurrentSlideIndex = 0;
 
         this.mSlidePreviewsBytes = new SparseArray<byte[]>();
         this.mSlideNotes = new SparseArray<String>();
 
-        this.mTimer = new Timer();
+        this.mTimer = aTimer;
     }
 
     public void setSlidesCount(int aSlidesCount) {
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java
index 84a793253328..9efc42e66fa9 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java
@@ -8,116 +8,82 @@
  */
 package org.libreoffice.impressremote.communication;
 
-public class Timer {
-    /**
-     * This stores the starting time of the timer if running.
-     * <p/>
-     * If paused this stores how long the timer was previously running.
-     */
-    private long mTime;
-    private long mCountdownTime;
+import java.util.concurrent.TimeUnit;
 
-    private boolean mIsRunning;
-    private boolean mIsCountdown;
+import android.os.Handler;
 
-    public Timer() {
-        mTime = 0;
-        mCountdownTime = 0;
-
-        mIsRunning = false;
-        mIsCountdown = false;
+public class Timer implements Runnable {
+    public interface TimerListener {
+        public void onTimerUpdated();
     }
 
-    /**
-     * Set whether this timer should be a normal or a countdown timer.
-     *
-     * @param aIsCountdown Whether this should be a countdown timer.
-     */
-    public void setCountdown(boolean aIsCountdown) {
-        mIsCountdown = aIsCountdown;
+    private static final long UPDATE_PERIOD_IN_MINUTES = 1;
 
-        if (mIsRunning) {
-            reset();
-        }
+    private final Handler mTimerHandler;
+    private final TimerListener mTimerListener;
+
+    private int mTotalMinutes;
+    private int mPassedMinutes;
+
+    public Timer(TimerListener aTimerListener) {
+        mTimerHandler = new Handler();
+        mTimerListener = aTimerListener;
+
+        mTotalMinutes = 0;
+        mPassedMinutes = 0;
     }
 
-    public boolean isCountdown() {
-        return mIsCountdown;
+    public void setMinutesLength(int aLengthInMinutes) {
+        mTotalMinutes = aLengthInMinutes;
     }
 
-    /**
-     * Set the countdown time. Can be set, and isn't lost, whatever mode
-     * the timer is running in.
-     *
-     * @param aCountdownTime The countdown time.
-     */
-    public void setCountdownTime(long aCountdownTime) {
-        mCountdownTime = aCountdownTime;
+    public int getMinutesLength() {
+        return mTotalMinutes;
     }
 
-    public long getCountdownTime() {
-        return mCountdownTime;
-    }
-
-    public boolean isRunning() {
-        return mIsRunning;
-    }
-
-    /**
-     * Reset the timer, and stop it it was running.
-     */
-    public void reset() {
-        mIsRunning = false;
-        mTime = 0;
+    public boolean isSet() {
+        return mTotalMinutes != 0;
     }
 
     public void start() {
-        if (mIsRunning) {
+        if (!isSet()) {
             return;
         }
 
-        mTime = System.currentTimeMillis() - mTime;
-        mIsRunning = true;
+        mTimerHandler.postDelayed(this, TimeUnit.MINUTES.toMillis(UPDATE_PERIOD_IN_MINUTES));
+    }
+
+    @Override
+    public void run() {
+        updatePassedMinutes();
+
+        mTimerListener.onTimerUpdated();
+
+        start();
+    }
+
+    private void updatePassedMinutes() {
+        mPassedMinutes++;
+    }
+
+    public void pause() {
+        stop();
+    }
+
+    public void resume() {
+        start();
     }
 
     public void stop() {
-        if (!mIsRunning)
-            return;
-
-        mTime = System.currentTimeMillis() - mTime;
-        mIsRunning = false;
+        mTimerHandler.removeCallbacks(this);
     }
 
-    /**
-     * Get either how long this timer has been running, or how long the
-     * timer still has left to run.
-     *
-     * @return running time in millis.
-     */
-    public long getTimeMillis() {
-        if (mIsCountdown) {
-            return calculateCountdownRunningTime();
-        }
-
-        return calculateRunningTime();
+    public boolean isTimeUp() {
+        return getMinutesLeft() <= 0;
     }
 
-    private long calculateCountdownRunningTime() {
-        long aRunningTime = mCountdownTime - calculateRunningTime();
-
-        if (aRunningTime < 0) {
-            reset();
-        }
-
-        return aRunningTime;
-    }
-
-    private long calculateRunningTime() {
-        if (mIsRunning) {
-            return System.currentTimeMillis() - mTime;
-        }
-
-        return mTime;
+    public int getMinutesLeft() {
+        return mTotalMinutes - mPassedMinutes;
     }
 }
 
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
new file mode 100644
index 000000000000..accfd8bdeaaf
--- /dev/null
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
@@ -0,0 +1,136 @@
+package org.libreoffice.impressremote.fragment;
+
+import java.util.concurrent.TimeUnit;
+
+import android.app.Dialog;
+import android.app.TimePickerDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
+import android.view.View;
+import android.widget.TimePicker;
+
+import com.actionbarsherlock.app.SherlockDialogFragment;
+import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.util.Intents;
+
+public class TimerEditingDialog extends SherlockDialogFragment implements TimePickerDialog.OnTimeSetListener, DialogInterface.OnClickListener, DialogInterface.OnShowListener, View.OnClickListener {
+    public static final String TAG = "TIMER_EDITING";
+
+    private static final boolean IS_24_HOUR_VIEW = true;
+
+    private int mMinutes;
+
+    public static TimerEditingDialog newInstance(int aMinutes) {
+        TimerEditingDialog aDialog = new TimerEditingDialog();
+
+        aDialog.setArguments(buildArguments(aMinutes));
+
+        return aDialog;
+    }
+
+    private static Bundle buildArguments(int aMinutes) {
+        Bundle aArguments = new Bundle();
+
+        aArguments.putInt("MINUTES", aMinutes);
+
+        return aArguments;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mMinutes = getArguments().getInt("MINUTES");
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle aSavedInstanceState) {
+        TimePickerDialog aDialog = new TimePickerDialog(getActivity(), this,
+            getHours(mMinutes), getMinutes(mMinutes), IS_24_HOUR_VIEW);
+
+        aDialog.setTitle(R.string.title_timer);
+
+        aDialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.button_save), this);
+        aDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.button_cancel), this);
+        aDialog.setButton(DialogInterface.BUTTON_NEUTRAL, getString(R.string.button_reset), this);
+
+        aDialog.setOnShowListener(this);
+
+        return aDialog;
+    }
+
+    private int getMinutes(int aMinutes) {
+        return (int) (aMinutes - getHours(aMinutes) * TimeUnit.HOURS.toMinutes(1));
+    }
+
+    private int getHours(int aMinutes) {
+        return (int) (aMinutes / TimeUnit.HOURS.toMinutes(1));
+    }
+
+    @Override
+    public void onTimeSet(TimePicker aTimePicker, int aHour, int aMinute) {
+        mMinutes = getMinutes(aHour, aMinute);
+    }
+
+    private int getMinutes(int aHours, int aMinutes) {
+        return (int) (TimeUnit.HOURS.toMinutes(aHours) + aMinutes);
+    }
+
+    @Override
+    public void onClick(DialogInterface aDialogInterface, int aButtonId) {
+        getTimePickerDialog().onClick(aDialogInterface, aButtonId);
+
+        switch (aButtonId) {
+            case DialogInterface.BUTTON_NEGATIVE:
+                resumeTimer();
+                break;
+
+            case DialogInterface.BUTTON_POSITIVE:
+                changeTimer();
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    private TimePickerDialog getTimePickerDialog() {
+        return (TimePickerDialog) getDialog();
+    }
+
+    private void resumeTimer() {
+        Intent aIntent = Intents.buildTimerResumedIntent();
+        LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(aIntent);
+    }
+
+    private void changeTimer() {
+        Intent aIntent = Intents.buildTimerChangedIntent(mMinutes);
+        LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(aIntent);
+    }
+
+    @Override
+    public void onShow(DialogInterface dialogInterface) {
+        setUpNeutralButton();
+    }
+
+    private void setUpNeutralButton() {
+        TimePickerDialog aDialog = (TimePickerDialog) getDialog();
+
+        aDialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View aView) {
+        // Requires the additional listener to not close the dialog.
+
+        resetTime();
+    }
+
+    private void resetTime() {
+        TimePickerDialog aDialog = (TimePickerDialog) getDialog();
+
+        aDialog.updateTime(0, 0);
+    }
+}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
new file mode 100644
index 000000000000..99374f817bfe
--- /dev/null
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerSettingDialog.java
@@ -0,0 +1,72 @@
+package org.libreoffice.impressremote.fragment;
+
+import java.util.concurrent.TimeUnit;
+
+import android.app.Dialog;
+import android.app.TimePickerDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
+import android.widget.TimePicker;
+
+import com.actionbarsherlock.app.SherlockDialogFragment;
+import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.util.Intents;
+
+public class TimerSettingDialog extends SherlockDialogFragment implements TimePickerDialog.OnTimeSetListener, DialogInterface.OnClickListener {
+    public static final String TAG = "TIMER_SETTING";
+
+    private static final int INITIAL_HOUR = 0;
+    private static final int INITIAL_MINUTE = 15;
+
+    private static final boolean IS_24_HOUR_VIEW = true;
+
+    private int mMinutes;
+
+    public static TimerSettingDialog newInstance() {
+        return new TimerSettingDialog();
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle aSavedInstanceState) {
+        TimePickerDialog aDialog = new TimePickerDialog(getActivity(), this,
+            INITIAL_HOUR, INITIAL_MINUTE, IS_24_HOUR_VIEW);
+
+        aDialog.setTitle(R.string.title_timer);
+
+        aDialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(R.string.button_start), this);
+        aDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.button_cancel), this);
+
+        return aDialog;
+    }
+
+    @Override
+    public void onTimeSet(TimePicker aTimePicker, int aHour, int aMinute) {
+        mMinutes = getMinutes(aHour, aMinute);
+    }
+
+    private int getMinutes(int aHours, int aMinutes) {
+        return (int) (TimeUnit.HOURS.toMinutes(aHours) + aMinutes);
+    }
+
+    @Override
+    public void onClick(DialogInterface aDialogInterface, int aButtonId) {
+        getTimePickerDialog().onClick(aDialogInterface, aButtonId);
+
+        if (aButtonId != DialogInterface.BUTTON_POSITIVE) {
+            return;
+        }
+
+        startTimer();
+    }
+
+    private TimePickerDialog getTimePickerDialog() {
+        return (TimePickerDialog) getDialog();
+    }
+
+    private void startTimer() {
+        Intent aIntent = Intents.buildTimerStartedIntent(mMinutes);
+        LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(aIntent);
+    }
+}
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/FragmentOperator.java b/android/sdremote/src/org/libreoffice/impressremote/util/FragmentOperator.java
index 3c6506307938..af7e47c5b700 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/FragmentOperator.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/FragmentOperator.java
@@ -17,25 +17,35 @@ public final class FragmentOperator {
     private FragmentOperator() {
     }
 
-    public static void setUpFragment(FragmentActivity aActivity, Fragment aFragment) {
-        if (isFragmentSetUp(aActivity)) {
+    public static void addFragment(FragmentActivity aActivity, Fragment aFragment) {
+        if (isFragmentAdded(aActivity)) {
             return;
         }
 
-        installFragment(aActivity, aFragment);
+        FragmentTransaction aFragmentTransaction = beginFragmentTransaction(aActivity);
+
+        aFragmentTransaction.add(android.R.id.content, aFragment);
+
+        aFragmentTransaction.commit();
     }
 
-    private static boolean isFragmentSetUp(FragmentActivity aActivity) {
+    private static boolean isFragmentAdded(FragmentActivity aActivity) {
         FragmentManager aFragmentManager = aActivity.getSupportFragmentManager();
 
         return aFragmentManager.findFragmentById(android.R.id.content) != null;
     }
 
-    private static void installFragment(FragmentActivity aActivity, Fragment aFragment) {
+    private static FragmentTransaction beginFragmentTransaction(FragmentActivity aActivity) {
         FragmentManager aFragmentManager = aActivity.getSupportFragmentManager();
-        FragmentTransaction aFragmentTransaction = aFragmentManager.beginTransaction();
 
-        aFragmentTransaction.add(android.R.id.content, aFragment);
+        return aFragmentManager.beginTransaction();
+    }
+
+    public static void replaceFragmentAnimated(FragmentActivity aActivity, Fragment aFragment) {
+        FragmentTransaction aFragmentTransaction = beginFragmentTransaction(aActivity);
+        aFragmentTransaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
+
+        aFragmentTransaction.replace(android.R.id.content, aFragment);
 
         aFragmentTransaction.commit();
     }
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
index ad7cfc1324c9..eb85418ea14d 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java
@@ -39,6 +39,11 @@ public final class Intents {
         public static final String SLIDE_CHANGED = "SLIDE_CHANGED";
         public static final String SLIDE_PREVIEW = "SLIDE_PREVIEW";
         public static final String SLIDE_NOTES = "SLIDE_NOTES";
+
+        public static final String TIMER_UPDATED = "TIMER_UPDATED";
+        public static final String TIMER_STARTED = "TIMER_STARTED";
+        public static final String TIMER_RESUMED = "TIMER_RESUMED";
+        public static final String TIMER_CHANGED = "TIMER_CHANGED";
     }
 
     public static final class Extras {
@@ -52,6 +57,8 @@ public final class Intents {
         public static final String SERVER_NAME = "SERVER_NAME";
 
         public static final String SLIDE_INDEX = "SLIDE_INDEX";
+
+        public static final String MINUTES = "MINUTES";
     }
 
     public static final class RequestCodes {
@@ -139,6 +146,28 @@ public final class Intents {
     public static Intent buildCommunicationServiceIntent(Context aContext) {
         return new Intent(aContext, CommunicationService.class);
     }
+
+    public static Intent buildTimerUpdatedIntent() {
+        return new Intent(Actions.TIMER_UPDATED);
+    }
+
+    public static Intent buildTimerStartedIntent(int aMinutesLength) {
+        Intent aIntent = new Intent(Actions.TIMER_STARTED);
+        aIntent.putExtra(Extras.MINUTES, aMinutesLength);
+
+        return aIntent;
+    }
+
+    public static Intent buildTimerResumedIntent() {
+        return new Intent(Actions.TIMER_RESUMED);
+    }
+
+    public static Intent buildTimerChangedIntent(int aMinutesLength) {
+        Intent aIntent = new Intent(Actions.TIMER_CHANGED);
+        aIntent.putExtra(Extras.MINUTES, aMinutesLength);
+
+        return aIntent;
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */