From 1fef0144b3f872a38dde7ede5be22f89e2baacc5 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 11 May 2012 15:04:08 -0700
Subject: [PATCH] Move voice frequency and split frequency to menu items.

---
 .../drawable-hdpi/menu_split_frequency.png    | Bin 0 -> 1520 bytes
 .../drawable-hdpi/menu_voice_frequency.png    | Bin 0 -> 2008 bytes
 .../drawable-mdpi/menu_split_frequency.png    | Bin 0 -> 1326 bytes
 .../drawable-mdpi/menu_voice_frequency.png    | Bin 0 -> 1582 bytes
 .../drawable-xhdpi/menu_split_frequency.png   | Bin 0 -> 1760 bytes
 .../drawable-xhdpi/menu_voice_frequency.png   | Bin 0 -> 2489 bytes
 MyTracks/res/menu/track_detail.xml            |  24 ++--
 .../res/values/arrays_do_not_translate.xml    |  32 ++---
 MyTracks/res/values/strings.xml               |  52 ++++----
 MyTracks/res/xml/recording_settings.xml       |  12 --
 .../apps/mytracks/TrackDetailActivity.java    |  22 ++++
 .../fragments/FrequencyDialogFragment.java    | 118 ++++++++++++++++++
 .../services/tasks/PeriodicTaskExecutor.java  |   4 +-
 .../settings/RecordingSettingsActivity.java   |  30 -----
 .../apps/mytracks/util/PreferencesUtils.java  |   2 +-
 15 files changed, 200 insertions(+), 96 deletions(-)
 create mode 100644 MyTracks/res/drawable-hdpi/menu_split_frequency.png
 create mode 100644 MyTracks/res/drawable-hdpi/menu_voice_frequency.png
 create mode 100644 MyTracks/res/drawable-mdpi/menu_split_frequency.png
 create mode 100644 MyTracks/res/drawable-mdpi/menu_voice_frequency.png
 create mode 100644 MyTracks/res/drawable-xhdpi/menu_split_frequency.png
 create mode 100644 MyTracks/res/drawable-xhdpi/menu_voice_frequency.png
 create mode 100644 MyTracks/src/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java

diff --git a/MyTracks/res/drawable-hdpi/menu_split_frequency.png b/MyTracks/res/drawable-hdpi/menu_split_frequency.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdf97e2a5b2554920fb1b50f53dd854eb4ad3816
GIT binary patch
literal 1520
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(#^lGsViy)Y!tr(Am_~$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY
zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zmYDJ>mw|yP$<xI#
zq~g|_nf@Ljjxxt<e=oPc?bxIvnxc8QdBX)q8<z><f<^)Ul}5WdT<^N93}%sQ@l*8J
z{vu#r)WH+YL9$K(O-%Y)8%5$mn4H(fmVbZy+WJFmh0Q&?s4qwJZ%F>waQe-r-*(3L
z%|FkMJzY4*YHsurzt3qbJq>~eOk342@UfMO1&IG=h`AEDK>SN{ae~Z|5}_SD#~N0}
zemhudu&Db0=LZgx2BzOd5BPR0Yd%n0Ao{29>rIhr4m}UC7fjCcy7jj^7j#|}(!6j;
zu&*ho^}EJK=?B|P8a3R_I6ocWs>q*bxLe8df!>ajYvwPSaR22?m3V7zH3xUocp>h>
zFUAQ|m?AGYZ(4US_+#a%;~c3voJ_A4-LL#LX^!A_2f;n8?55FYS`C?>YM2=DNp><7
zPGIo8(<1fr#*yb|AJ|mr_$DxvY?cU4J($^7RylR!%<Qd)*BRVjq_l-QNW|jFvnA7x
z-Ji#?vb1)V(;_|-`GeVMyFD5w`R}=QAbq9!Cd&<?2Gv<#ZXYNXD|p0WcF?By{dJkT
zJoV%+Et`X;Y~fn!D4(CSyUAsm(sl>!A18mi9a&h%tP^y=R^ndJf+Ls1yHZR2F0B{J
zk6?1C_-Orrd$H*Eo%&o?uURH?*Raa(Sh#Xx{mJI;RT}k;##Vpyrlk2?JE-$JF7S!4
zs?JF!?*z#+6<Vj{AIMc4^k@w;k#jd(uC)2><@HAPC$DDA(4L^2%NFwc*wke~)yE=K
zRoq_0-xi5Tow$7I0l5nK4b|ON7g**hzOucaD_=VG*L<e?2b)%Z=_`6_71WzD^M7YA
iD0<x%EMxu0Wx&7^S=}P~%+Cu{279{txvX<aXaWG;RxV@!

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-hdpi/menu_voice_frequency.png b/MyTracks/res/drawable-hdpi/menu_voice_frequency.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b69ea56b53b0a0509f71af9c44ab0aacb68feea
GIT binary patch
literal 2008
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
YQrZF+?-GekZ@+5=VUfHu+{E4g0dW^F^Z)<=

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-mdpi/menu_split_frequency.png b/MyTracks/res/drawable-mdpi/menu_split_frequency.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd0c919e2ae90e5f3f2d2d8181842b935f6d2c4
GIT binary patch
literal 1326
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(#^lGsViy)Y!tr(Am<|$-vFf(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_ab1z4zmy_Wnf@j;OXKR
zQgQ3e_4C>+i89AO%I+6$og%Nf^Ovalss9dvMU#r2IZWA67@()8=XL6+uLobz0*_O^
zCy&NuXtFD93M<<)|Ch`%-QS0+d@`5EoqhA>+?n)!=Rcn@e!XLz^oQb;oIm!YF#lQ2
z;P^%1{(6SBGaM$%GoCW+wK}ul%X(&?MS}bphkwMgy>OS0dyrw<@GgX}%&10a*0;D&
z_CFuq=pQg{6WA2Wc=_Ds6)rmOcKcsR;Cs7GE1*%#W+At7#{v#-3rER3;ZQ~WW-gmY
z9=AhJT-_EK|IlXY<R#Jz0?JeMBKpl`QZ98)Vtp|oD&+N{WnWaKelMQMw=jjV>tZ+C
z-CQ5pGh06MmF1piZI8GtU@WV%iXkv`N$~#STvm=3e(N8rNeVBJ)SeNvx#kvELe=kO
zr`~1d?$JJ>a4bYI`|?MzcV9l-JU(-q?AP7}Z@)7Zf3)3`BzHLCi%nVbHn+y|o5y(H
zeXW!fj|ebbwC#R}-bT6Y?<0cqpDh3EWyQYp{*+%K&ZZf=IfZl;&qoJjT0Q@}mLV~x
qBJFU&Dt4=z`_pbR)Up2%N?=fZ6Q!r4lCls~f_b|7xvX<aXaWE%`rG3G

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-mdpi/menu_voice_frequency.png b/MyTracks/res/drawable-mdpi/menu_voice_frequency.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8dd8469ca5a8674628936da2258291b9d1b8e71
GIT binary patch
literal 1582
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(%IC>$jQLe$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O<nUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR<{_N
zTACX;;WQ7bHwCL(z<Pn6!Ql^mpkwqwQHvDSFd<<20WskT7s!Dp{nR{QdM^Sd?4rLX
zd>9y*7I?ZihE&{oGyQb7u%pcJ^2s5$Z$z=K)V~sz6X=o^=wBre=%^9r@<C0mN^s&m
zn+~NfN>x+;F@AfpRsHLNN8AU^S7?Z6>n2Id*Jez1yS(mx<M~4Z+fHuSsOiCOw_)?_
znSal{-}$jw;e%L_${tp^Zl)l^>vILzTlMogZeJBCh=@tZ4O%14@3Kxx?}oxT?#Wil
zk9t;!%U<njEKV|AR<E7cb)JuD(toD|hJXHb^TrqdpPZq)F>n43wQ1o>3A)eD8P6Ad
zzf(@gSM}ODp}9%vs!Y2CKen45<BG2^(+caFWqIwM@ZqHWD@so?J-(m2DAq^#soJOI
zIu|1+CfX@V9SLG-OP)SMRR1XV#^@Zu{8OAa^z^!HIXFBv9uWF*dzQcADzVcQ9Xplm
zy7XAyh~^$;S`?EIcSq^i4V&z}XC6;ErnP*gzp_^D-(yEkDQ{%HUgK~@ZMwt_jaLTu
zV-_p)2_@Lid~R5*@uo8)Wq%;w#$&Dyw-!2yd8`&&XL~2fr>3j6y>gpVPjRgI{Ie&H
z=i0H)&@7r;tavJFxz<%@wWAACb>)Tm6M9Q+qz{W~zMC#;;BrO%6vqqk`yK~Xp6%5;
z7j^KD?8L;M=XP*ZoKgyondU0eFZHTk|MQ1RzRl@B&N6<KG0%DSrCG1_gvm^AkwrQ`
zZ=c+Hyv^HUV*3fEmoFlh?sBh5z32E;ra&+u?gQVM9nPCGpQ>(7@e;mx*F)>sTH7=E
z@1mJ{t>xS}3r;d^{u$~wGvRYpRkQnpzZ!x&mPwm+?|vhy%`4w+=O_H_``T;nr#xnU
zU8Z5X`b+hK=?lCbKQ4P`9=+Bw>yD6mVYn+(5z94}JOkg?9C{T`H<)eG_-Xi0a;98?
z<VVe2w?8flvsoX1^zV*`0?S`@|NgW?EaFf0w|dSW+6NfCQ&#BgnCZ<9D#1Nn{an^L
HB{Ts5yn#`o

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-xhdpi/menu_split_frequency.png b/MyTracks/res/drawable-xhdpi/menu_split_frequency.png
new file mode 100644
index 0000000000000000000000000000000000000000..982df112db7d22862886938613e14c25337e8491
GIT binary patch
literal 1760
zcmaJ?X;2eq7+&rhiy)UHT_d6>Np=GP6Nv~3lu(jF2oS_7Az2`WWY^6K0gHv;0R;+*
z6csEERXj>5c9ga%M+BslQgGCkT9wFHK!=Lfk)!qK1_k{g-I?9*d*6AV=RLmXn=OhG
zzGr9cZVdo{9Y35WBG-+E*V3H)o>pwTO)hRksDy|?Q-~}njsU@OG#LT;N@*%0LZtHS
zZ9PaJ0GN0x#1cXxh-Ax9B~5CGp=p#Di3WhcAPpv!r6UBGjHD`59LmInHVUYab13ml
z0VKe<NSY!%2S;LZgko7vx{M{K1Z@BVHEfbVi4amyqs&mL*%}UImX}TL4Q@IGoDCt;
zIh2=0Nd!?K7sU~fNrR{|$R7s%{b;Zs#PVbLfD8zR=rDs01yEs#%?w~eF!<`BklAo~
z3R}brdzFi{IFvMkz}R$pR#p}*%a?}YsdSjdV$mT6oxz}z5ma@yijZokD)ovv1|Fi8
z;R=jUpeoS7C{0GU6C4Uz>B|<B*gUOD{c23)z~~w&Mu%yTp{2P%f#Cl`mCE^OH6cP?
z*ZWptwKy9?=psaoZpUTh!KJJ)q{7%-9FY<zE=JLexhY1ap#-W<LotvW!=%BWKq^zH
z44zqpK)~j!)Pz(eL-;%nh2)?q6moVL(|4U8%!QdDP#6q{!Yn_S73vql4Gv?%0e&Iy
z9F~X5wkr`8F^84E#xfSf8pNQ)$jm$hS7ajcFdS8avrV%VZ>z;GBxIexFSH=vE3ACs
zS{BCA$zte+qkZG3=Uk+I4BL6(lE%FB5f!O-oD}xjt(S_)`y%4=g2kE}<A;0G9iyEt
zryf?EJ5}HMwTS1m`Q-QSxU@buzGbO0UE&a3zGijkwcRIe%v^@UoQiK1(xZ+I%cK_;
zcTU+f6l?Xe<<rfZO5sC~*59?U?KpcRyyE8;^`fU~41V>FwjCqur*2-G4D64<2g86B
zc@FKCNv4pot5FF+nj6QHsbdzu?O)yQgSkI7UaISk$c_5YcGVD&ndb~umpN7%CF=ak
zD<9?OV6L0PwLq^9E;puq!_r#}+JAA+r(HatJKJx*<^6(gr#sb+9s~9xyCQGbxzUaR
zn^M|yn)X&q?UDHWz?{@pv#pwd8o;f*IBNNZ{62l9y>W@fiT0bpq97l49Vf21=Dx>(
z`A8L<T{M*BJy@4x-eCT(roSrUHdb(E#<y$gfiY)|HRwHLbvggy#6MeWU8TQon%F@r
z8!EV^*S)asJSFXG>m+Dh?>1?VLoUfXbBPzxMnMPbt_mMoO1h5J23^+D8k;BkqGCHN
zqdNM9S54F1g}b{d@$07b1#y$p$7`t>J9EU&V4syxAD78kwXW2$Mi(nQlffd0nU+=K
z4-fp3XP2}xG_5{yG@;j~^RW{D+p{~jJ^ngJzcM~|aqTA-CJhrTYyIM~@MUc_s<9+(
zRy&fif9aiP-jkEd9GY7qEXzk9jH^5U=t<dg);yDlsM2l0sz;ndA-IdH_mtH4ZqNtD
z`~Nhww&`Ai?Pmoh4XzP3U;@@wayIjx*|14^!*CV&_~7!`CwunYu<SY7pTE-SI+a^k
zo8*NS8Sjq9*ZLg)%OUaF(MQZ_d*4fxUJg&~Hr(~C%UJTW?{X`utXibatPV}VSEnrw
z)GZC1irsZ3@W(+@d+nm6$eQy5`#cH{4u+~U8IAW7gioy{-4#dA7a}n|nUafovx(8Y
z`p+kr4#`0?mu#;H0R`50b&!3?EO@l-qa|hMc5owOicK66p7{PcaN^vs-FjV2b2qan
z!sFBWkhmZpFYT8}`<T-%o}|N>()xkB_l)+gl3D`O{v10J`?S08<8$3kCt~iXCLK%p
zOE%WE-H_qQUU>~Wz3%4Jiw-#i7;Q=Hsu<31f8y0zFLo1CX4U(qnE9oj7~28|o-abC
S%8qR|{B!uBLSAD?lJ-A=qolI{

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-xhdpi/menu_voice_frequency.png b/MyTracks/res/drawable-xhdpi/menu_voice_frequency.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfd2b33c73815a93dde886e387655ffbef3e24a5
GIT binary patch
literal 2489
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
an_$hYhdiAbi#1C>Q+{4d`X$eZwEqC6vG{fX

literal 0
HcmV?d00001

diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index ccc42927c..b463e4134 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -59,15 +59,25 @@ limitations under the License.
     android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
   <!-- android:orderInCategory="6" is in map.xml -->
+  <item
+    android:icon="@drawable/menu_voice_frequency"
+    android:id="@+id/track_detail_voice_frequency"
+    android:orderInCategory="7"
+    android:title="@string/menu_voice_frequency"/>
+  <item
+    android:icon="@drawable/menu_split_frequency"
+    android:id="@+id/track_detail_split_frequency"
+    android:orderInCategory="8"
+    android:title="@string/menu_split_frequency"/>
   <item
     android:icon="@drawable/menu_send_google"
     android:id="@+id/track_detail_send_google"
-    android:orderInCategory="7"
+    android:orderInCategory="9"
     android:title="@string/menu_send_google"/>
   <item
     android:icon="@drawable/menu_save"
     android:id="@+id/track_detail_save"
-    android:orderInCategory="8"
+    android:orderInCategory="10"
     android:title="@string/menu_save">
     <menu>
       <item android:id="@+id/track_detail_save_gpx"/>
@@ -79,26 +89,26 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_edit"
     android:id="@+id/track_detail_edit"
-    android:orderInCategory="9"
+    android:orderInCategory="11"
     android:title="@string/menu_edit"/>
   <item
     android:icon="@drawable/menu_delete"
     android:id="@+id/track_detail_delete"
-    android:orderInCategory="10"
+    android:orderInCategory="12"
     android:title="@string/menu_delete"/>
   <item
     android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
-    android:orderInCategory="11"
+    android:orderInCategory="13"
     android:title="@string/menu_sensor_state"/>
   <item
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_detail_settings"
-    android:orderInCategory="12"
+    android:orderInCategory="14"
     android:title="@string/menu_settings"/>
   <item
     android:icon="@drawable/menu_help"
     android:id="@+id/track_detail_help"
-    android:orderInCategory="13"
+    android:orderInCategory="15"
     android:title="@string/menu_help"/>
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index fb5aeb571..4ca399897 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -96,6 +96,22 @@ limitations under the License.
     <item>CSV</item>
     <item>TCX</item>
   </string-array>
+  <string-array name="frequency_values">
+    <item>0</item>
+    <item>1</item>
+    <item>2</item>
+    <item>5</item>
+    <item>10</item>
+    <item>15</item>
+    <item>30</item>
+    <item>60</item>
+    <item>-1</item>
+    <item>-5</item>
+    <item>-10</item>
+    <item>-25</item>
+    <item>-50</item>
+    <item>-100</item>
+  </string-array>
   <string-array name="max_recording_distance_values">
     <item>50</item>
     <item>100</item>
@@ -142,22 +158,6 @@ limitations under the License.
     <item>2000</item>
     <item>5000</item>
   </string-array>
-  <string-array name="periodic_task_values">
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-    <item>5</item>
-    <item>10</item>
-    <item>15</item>
-    <item>30</item>
-    <item>60</item>
-    <item>-1</item>
-    <item>-5</item>
-    <item>-10</item>
-    <item>-25</item>
-    <item>-50</item>
-    <item>-100</item>
-  </string-array>
   <string-array name="sensor_type_all_options">
     <item>@string/settings_sensor_type_none</item>
     <item>@string/settings_sensor_type_ant</item>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 312f6acfd..886aad545 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1117,14 +1117,24 @@ limitations under the License.
     Map URL
   </string>
   <string name="menu_show_on_map"
-    translation_description="In the menu, to show a marker on map.">
+    translation_description="In the menu, to show a track or a marker on the map.">
     Show on map
   </string>
+  <string name="menu_split_frequency"
+    translation_description="In the menu, to configure the split frequency, how frequent to insert
+      a split marker.">
+    Split frequency
+  </string>
   <string name="menu_stop_recording"
     translation_description="In the menu, to stop recording a track.">
     Stop recording
   </string>
-
+  <string name="menu_voice_frequency"
+    translation_description="In the menu, to configure the voice frequency, how frequent to announce
+      status.">
+    Voice frequency
+  </string>
+  
   <!-- My Location -->
   <string name="my_location_approximate_location"
     translation_description="When displaying the user's current location, a status message
@@ -1647,19 +1657,6 @@ limitations under the License.
       recordings of your position.">
     Smallest time interval between two recordings of your position.
   </string>
-  <string name="settings_recording_marker"
-    translation_description="In the 'Recording' settings, the dropdown option to configure the time
-      or distance a new marker will be inserted.
-
-      Character limit: ~23 (1 line)">
-    Marker
-  </string>
-  <string name="settings_recording_marker_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'Marker'
-      dropdown option explaining that it configures the time or distance after which a new marker
-      will be inserted.">
-    Time/distance after which a new marker will be inserted.
-  </string>
   <string name="settings_recording_track_distance"
     translation_description="In the 'Recording' settings, the dropdown option to configure the
       distance between two tracks.
@@ -1707,20 +1704,7 @@ limitations under the License.
       list explaining that it chooses the default track name format.">
     Default track name
   </string>
-  <string name="settings_recording_voice"
-    translation_description="In the 'Recording' settings, the dropdown option to configure the voice
-      announcement frequency.
 
-      Character limit: ~23 (1 line)">
-    Voice
-  </string>
-  <string name="settings_recording_voice_summary"
-    translation_description="In the 'Recording' settings, the summary for the 'Voice'
-      dropdown option explaining that it configures the time or distance between two voice
-      announcements.">
-    Time/distance between two voice announcements.
-  </string>
-  
   <!-- Settings Reset -->
   <string name="settings_reset"
     translation_description="In the 'Settings' page, the option to reset everything to the defaults.
@@ -1945,6 +1929,12 @@ limitations under the License.
    Remove any descriptive text when sharing a URL with friends.
   </string>
 
+  <!-- Settings Split -->
+  <string name="settings_split_frequency_title"
+    translation_description="In title of the 'Split frequency' dialog."> 
+    Time/distance between two split markers
+  </string>
+  
   <!-- Settings Stats -->
   <string name="settings_stats_coordinate"
     translation_description="In the 'Stats settings, the option to show latitude and longitude.">
@@ -2001,6 +1991,12 @@ limitations under the License.
     Preferred units
   </string>
 
+  <!-- Settings Voice -->
+  <string name="settings_voice_frequency_title"
+    translation_description="The title of the 'Voice frequency' dialog.">
+    Time/distance between two voice announcements
+  </string>
+
   <!-- Share Track -->
   <string name="share_track_file_body_format"
     translation_description="When sharing a track file with friends, the body of the message.">
diff --git a/MyTracks/res/xml/recording_settings.xml b/MyTracks/res/xml/recording_settings.xml
index b79455ec4..fe3f5cff3 100644
--- a/MyTracks/res/xml/recording_settings.xml
+++ b/MyTracks/res/xml/recording_settings.xml
@@ -16,18 +16,6 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/settings_recording" >
-  <com.google.android.apps.mytracks.IntegerListPreference
-    android:defaultValue="0"
-    android:entryValues="@array/periodic_task_values"
-    android:key="@string/announcement_frequency_key"
-    android:summary="@string/settings_recording_voice_summary"
-    android:title="@string/settings_recording_voice" />
-  <com.google.android.apps.mytracks.IntegerListPreference
-    android:defaultValue="0"
-    android:entryValues="@array/periodic_task_values"
-    android:key="@string/split_frequency_key"
-    android:summary="@string/settings_recording_marker_summary"
-    android:title="@string/settings_recording_marker" />
   <ListPreference
     android:defaultValue="@string/settings_recording_track_name_date_local_value"
     android:entries="@array/track_name_options"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index e630547c7..1a571b59c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -24,6 +24,7 @@ import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.fragments.ChartFragment;
 import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment;
 import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment.DeleteOneTrackCaller;
+import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
 import com.google.android.apps.mytracks.fragments.InstallEarthDialogFragment;
 import com.google.android.apps.mytracks.fragments.MapFragment;
 import com.google.android.apps.mytracks.fragments.StatsFragment;
@@ -83,6 +84,8 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
   private MenuItem insertMarkerMenuItem;
   private MenuItem playMenuItem;
   private MenuItem shareMenuItem;
+  private MenuItem voiceFrequencyMenuItem;
+  private MenuItem splitFrequencyMenuItem;
   private MenuItem sendGoogleMenuItem;
   private MenuItem saveMenuItem;
 
@@ -222,6 +225,8 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
     playMenuItem = menu.findItem(R.id.track_detail_play);
     shareMenuItem = menu.findItem(R.id.track_detail_share);
+    voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
+    splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency);
     sendGoogleMenuItem = menu.findItem(R.id.track_detail_send_google);
     saveMenuItem = menu.findItem(R.id.track_detail_save);
 
@@ -298,6 +303,17 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
             .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
         startActivity(intent);
         return true;
+      case R.id.track_detail_voice_frequency:
+        FrequencyDialogFragment.newInstance(R.string.announcement_frequency_key,
+            PreferencesUtils.ANNOUNCEMENT_FREQUENCY_DEFAULT,
+            R.string.settings_voice_frequency_title)
+            .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG);
+        return true;
+      case R.id.track_detail_split_frequency:
+        FrequencyDialogFragment.newInstance(R.string.split_frequency_key,
+            PreferencesUtils.SPLIT_FREQUENCY_DEFAULT, R.string.settings_split_frequency_title)
+            .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG);
+        return true;
       case R.id.track_detail_send_google:
         intent = IntentUtils.newIntent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, true, true));
@@ -446,6 +462,12 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     if (shareMenuItem != null) {
       shareMenuItem.setVisible(!isRecording);
     }
+    if (voiceFrequencyMenuItem != null) {
+      voiceFrequencyMenuItem.setVisible(isRecording);
+    }
+    if (splitFrequencyMenuItem != null) {
+      splitFrequencyMenuItem.setVisible(isRecording);
+    }
     if (sendGoogleMenuItem != null) {
       sendGoogleMenuItem.setVisible(!isRecording);
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java
new file mode 100644
index 000000000..ea8cdf099
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * 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 com.google.android.apps.mytracks.fragments;
+
+import com.google.android.apps.mytracks.util.PreferencesUtils;
+import com.google.android.maps.mytracks.R;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+
+/**
+ * A DialogFragment to configure frequency.
+ * 
+ * @author Jimmy Shih
+ */
+public class FrequencyDialogFragment extends DialogFragment {
+
+  public static final String FREQUENCY_DIALOG_TAG = "frequencyDialog";
+
+  private static final String KEY_PREFERENCE_ID = "preferenceId";
+  private static final String KEY_DEFAULT_VALUE = "defaultValue";
+  private static final String KEY_TITLE_ID = "titleId";
+
+  public static FrequencyDialogFragment newInstance(
+      int preferenceId, int defaultValue, int titleId) {
+    Bundle bundle = new Bundle();
+    bundle.putInt(KEY_PREFERENCE_ID, preferenceId);
+    bundle.putInt(KEY_DEFAULT_VALUE, defaultValue);
+    bundle.putInt(KEY_TITLE_ID, titleId);
+
+    FrequencyDialogFragment frequencyDialogFragment = new FrequencyDialogFragment();
+    frequencyDialogFragment.setArguments(bundle);
+    return frequencyDialogFragment;
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    final int preferenceId = getArguments().getInt(KEY_PREFERENCE_ID);
+    int defaultValue = getArguments().getInt(KEY_DEFAULT_VALUE);
+    int titleId = getArguments().getInt(KEY_TITLE_ID);
+    int frequencyValue = PreferencesUtils.getInt(getActivity(), preferenceId, defaultValue);
+
+    return new AlertDialog.Builder(getActivity())
+        .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            int listIndex = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+            PreferencesUtils.setInt(getActivity(), preferenceId, getFrequencyValue(listIndex));
+          }
+        })
+        .setSingleChoiceItems(getFrequencyDisplayOptions(), getListIndex(frequencyValue), null)
+        .setTitle(titleId)
+        .create();
+  }
+
+  /**
+   * Gets the frequency display options.
+   */
+  private String[] getFrequencyDisplayOptions() {
+    boolean metricUnits = PreferencesUtils.getBoolean(
+        getActivity(), R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
+    String[] values = getResources().getStringArray(R.array.frequency_values);
+    String[] options = new String[values.length];
+    for (int i = 0; i < values.length; i++) {
+      int value = Integer.parseInt(values[i]);
+      if (value == PreferencesUtils.FREQUENCY_OFF) {
+        options[i] = getString(R.string.value_off);
+      } else if (value < 0) {
+        options[i] = getString(metricUnits ? R.string.value_integer_kilometer
+            : R.string.value_integer_mile, Math.abs(value));
+      } else {
+        options[i] = getString(R.string.value_integer_minute, value);
+      }
+    }
+    return options;
+  }
+
+  /**
+   * Gets the list index for a frequency value. Returns 0 if the value is not on
+   * the list.
+   */
+  private int getListIndex(int frequencyValue) {
+    String[] values = getResources().getStringArray(R.array.frequency_values);
+    for (int i = 0; i < values.length; i++) {
+      if (frequencyValue == Integer.parseInt(values[i])) {
+        return i;
+      }
+    }
+    return 0;
+  }
+
+  /**
+   * Gets the frequency value from a list index.
+   * 
+   * @param listIndex the list index
+   */
+  private int getFrequencyValue(int listIndex) {
+    String[] values = getResources().getStringArray(R.array.frequency_values);
+    return Integer.parseInt(values[listIndex]);
+  }
+}
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java
index 4f108732d..228ca27c8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java
@@ -35,7 +35,7 @@ public class PeriodicTaskExecutor {
    * A value greater than zero is a frequency in time.
    * A value less than zero is considered a frequency in distance.
    */
-  private int taskFrequency = PreferencesUtils.PERIODIC_TASK_OFF;
+  private int taskFrequency = PreferencesUtils.FREQUENCY_OFF;
 
   /**
    * The next distance when the task should execute.
@@ -75,7 +75,7 @@ public class PeriodicTaskExecutor {
         timerExecutor = null;
       }
     }
-    if (taskFrequency == PreferencesUtils.PERIODIC_TASK_OFF) {
+    if (taskFrequency == PreferencesUtils.FREQUENCY_OFF) {
       return;
     }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
index ccbea807b..656a3c0dd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
@@ -39,14 +39,6 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
     boolean metricUnits = PreferencesUtils.getBoolean(
         this, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
 
-    ListPreference announcementFrequencyListPreference = (ListPreference) findPreference(
-        getString(R.string.announcement_frequency_key));
-    announcementFrequencyListPreference.setEntries(getPeriodicTaskDisplayOptions(metricUnits));
-
-    ListPreference splitFrequencyListPreference = (ListPreference) findPreference(
-        getString(R.string.split_frequency_key));
-    splitFrequencyListPreference.setEntries(getPeriodicTaskDisplayOptions(metricUnits));
-
     ListPreference minRecordingIntervalListPreference = (ListPreference) findPreference(
         getString(R.string.min_recording_interval_key));
     minRecordingIntervalListPreference.setEntries(getMinRecordingIntervalDisplayOptions());
@@ -70,28 +62,6 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
     autoResumeTrackTimeoutListPreference.setEntries(getAutoResumeTrackTimeoutDisplayOptions());
   }
 
-  /**
-   * Gets the periodic task display options.
-   * 
-   * @param metricUnits true to display metric units
-   */
-  private String[] getPeriodicTaskDisplayOptions(boolean metricUnits) {
-    String[] values = getResources().getStringArray(R.array.periodic_task_values);
-    String[] options = new String[values.length];
-    for (int i = 0; i < values.length; i++) {
-      int value = Integer.parseInt(values[i]);
-      if (value == PreferencesUtils.PERIODIC_TASK_OFF) {
-        options[i] = getString(R.string.value_off);
-      } else if (value < 0) {
-        options[i] = getString(metricUnits ? R.string.value_integer_kilometer
-            : R.string.value_integer_mile, Math.abs(value));
-      } else {
-        options[i] = getString(R.string.value_integer_minute, value);
-      }
-    }
-    return options;
-  }
-
   /**
    * Gets the min recording interval display options.
    */
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
index 1c64c04b3..bf4a338ba 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
@@ -52,6 +52,7 @@ public class PreferencesUtils {
 
   public static final String DEFAULT_ACTIVITY_DEFAULT = "";
   public static final boolean DEFAULT_MAP_PUBLIC_DEFAULT = true;
+  public static final int FREQUENCY_OFF = 0;
   public static final int MAX_RECORDING_DISTANCE_DEFAULT = 200;
   public static final boolean METRIC_UNITS_DEFAULT = true;
   public static final int MIN_RECORDING_DISTANCE_DEFAULT = 5;
@@ -64,7 +65,6 @@ public class PreferencesUtils {
   public static final int MIN_REQUIRED_ACCURACY_EXCELLENT = 10;
   public static final int MIN_REQUIRED_ACCURACY_POOR = 5000;
 
-  public static final int PERIODIC_TASK_OFF = 0;
   public static final boolean PICK_EXISTING_MAP_DEFAULT = false;
   public static final String PREFERRED_ACCOUNT_DEFAULT = "";
   public static final long RECORDING_TRACK_ID_DEFAULT = -1L;