From 1de9fe67a335002e9624b2cbaac00bd17407af12 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 8 May 2012 11:45:46 -0700
Subject: [PATCH] Move chart settings to ChartSettingsActivity.

---
 MyTracks/AndroidManifest.xml                  |   1 +
 .../res/drawable-hdpi/menu_chart_settings.png | Bin 1426 -> 0 bytes
 .../res/drawable-mdpi/menu_chart_settings.png | Bin 1240 -> 0 bytes
 MyTracks/res/drawable-mdpi/x_axis.png         | Bin 286 -> 0 bytes
 MyTracks/res/drawable-mdpi/y_axis.png         | Bin 275 -> 0 bytes
 .../drawable-xhdpi/menu_chart_settings.png    | Bin 1544 -> 0 bytes
 MyTracks/res/layout/chart_settings.xml        |  66 ---------
 MyTracks/res/menu/track_detail.xml            |   4 -
 MyTracks/res/values/keys.xml                  |   8 +-
 MyTracks/res/values/strings.xml               |  52 +++----
 MyTracks/res/xml/chart_settings.xml           |  46 +++++++
 MyTracks/res/xml/settings.xml                 |   4 +
 MyTracks/res/xml/stats_settings.xml           |   2 +-
 .../android/apps/mytracks/ChartView.java      |  42 ++----
 .../apps/mytracks/TrackDetailActivity.java    |   7 -
 .../mytracks/fragments/ChartFragment.java     | 128 ++++++++++--------
 .../ChartSettingsDialogFragment.java          |  84 ------------
 .../settings/ChartSettingsActivity.java       |  54 ++++++++
 .../mytracks/settings/SettingsActivity.java   |  10 ++
 .../apps/mytracks/util/PreferencesUtils.java  |   8 ++
 .../mytracks/fragments/ChartFragmentTest.java |   6 +-
 21 files changed, 234 insertions(+), 288 deletions(-)
 delete mode 100644 MyTracks/res/drawable-hdpi/menu_chart_settings.png
 delete mode 100644 MyTracks/res/drawable-mdpi/menu_chart_settings.png
 delete mode 100644 MyTracks/res/drawable-mdpi/x_axis.png
 delete mode 100644 MyTracks/res/drawable-mdpi/y_axis.png
 delete mode 100644 MyTracks/res/drawable-xhdpi/menu_chart_settings.png
 delete mode 100644 MyTracks/res/layout/chart_settings.xml
 create mode 100644 MyTracks/res/xml/chart_settings.xml
 delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
 create mode 100644 MyTracks/src/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 50d9c3d62..6c21fd846 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -208,6 +208,7 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.BackupSettingsActivity" />
+    <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.MapSettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.RecordingSettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.SensorSettingsActivity" />
diff --git a/MyTracks/res/drawable-hdpi/menu_chart_settings.png b/MyTracks/res/drawable-hdpi/menu_chart_settings.png
deleted file mode 100644
index 0f650ee25d87d15a658f8d2ae2ca6b05cfe1d9e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1426
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$i>9e(!jvf$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O<nUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR<{_t
zI$F5mHV>*d1*==YdW~?pMIY!GeNfaQMKw$an0`P^c)|s8;7LC<518JIfC)Rw!CjAm
zfr-V_#WAGf)|;8O-iHH3+Jtjg3;l6$bvYU;!otdKU!cR`$LGiO=z*FZ*CT~pRy#U6
zN-xBIn9mXWm+{r3N8#CPmwmMT(B<eg+vIF6)As|+s=OyF&+q(xr#jE)cwvu4^kl)}
z%S>AsbQPXWTk+|?*$kGQY(LW*bu89}HdxGOTd%<B<Jx!n(HB;$rZffj=kpKP%C9-3
z65y;SpCzU+ZPDk~JzZRrbK)BhE|4r(zJ(#jl__Wa&2Pc2vqb&k&cDC(x<PCKYX)N!
zh&mG6@aAUu0VfgZSy^U$Wd}{R-`!NdzpuMNbOWc=LF4&b`F9<xoWjbp`Kr%m`xBpk
znQuQ3y+B-M<qP>g90Kgs2Q(!Z-=}_iWA?i(H0=??p1-@(d31_T&tc?W#WKYr=9gsY
z@<X+k*z}t8HXNT;BBs+=dEp$B(sjK9zH84;x~~|Lq&7*;%A)fRkHy3Hn%kDMhR?sv
z&KG&`+<~>Pv_j4vxftm7`?6_#-P#kCN})MTqB@7W#AddxIkCc8bko%5o=4bbd^Vo5
zXp7M44}U(q4i?!i<Ts=Ez!Mjr)`BBS=kq>FUuiine!^uB^IApD2?zGHs5&Tp=D6l0
z=d?}m(9Q`i%g;LhUEi+yQ*U#e<OCxP_O;X7ejUD>6u>y`WBC!=1e0eKce#`lUPlE=
vCr&%v{%PeU`CVHXbRD=aFg4xiXJBSH5SKPh)N#oxP$}u@>gTe~DWM4fjC}@i

diff --git a/MyTracks/res/drawable-mdpi/menu_chart_settings.png b/MyTracks/res/drawable-mdpi/menu_chart_settings.png
deleted file mode 100644
index d6235554be082aea46e1e06f55c3b7da22a70948..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaJ>TWs4@7<Q7ahN_z~ZG(2A=+v#aNQ*CN(qK1PZce&Ha|vk>VSt2VpEg$NOKg{<
zK^q%Plh|H(K!Oeg51k-`Y25mNgn*(3ZIw2GwC!atlu97=g=u5F6^-Mr>3ASmvd=lc
z{_p$0|NNi)W^R0JNB6#N48wM04)S@l0_T083w^Cd;|^N->{QX7&?oJhXhJM5>m>*>
zsyGGnP?Tq@%P@>#o*|`Bw2Q(aPSRCUbaKeLY9KU*g`;&tlq%2$B{-#M5#r`I-xENQ
zBgAt-ffkG;EGq{aCY)%D7o<i-Vr3$F0EFutB2b|%g1S1bSzJ9rZ18eu?}RA=Y^2zg
z2ystTQOJR$ZbA?wX`e)oFkmD=G69+mu=|0ZW@w7>Q*_A3&|EOY(G1vp2vp6KC%HVI
z-mHaA5u$9{21ik~T8*p?le#%YF)Yhcw4d_(eJI0c&1$w-_i5H(n}LUxWGaTO=o)Ys
z#gaZ_M+l_!UJI(RMXOnx*Mu&Ns*482khIfMJ5dn+KUGz?vMoCg@9X_fVyiG~Kq?O{
zea4i~;3fy1QU;eap=j%7LD#3-x0oyIwr-Vm10*McBm)FdQZy&Bfe-{Pqgl47Nif4l
z2*g1uip-_`d?3iufnb78GfawM0}PuAB$DxTkO>76OdHGV(u@i<yN#9aV}l*Bju}(~
zRpz0oyaMI4sjFb4X-?^^#ov){6DxPtGTaeMAu*IQ+JB9@9YX$bwp+$Uhb`+v4f)+f
z#(wI^X*Y(svKc;JsNX29-@O}Min$*<>FS!_*=yjRuXumKTB`+nB?^u{*mAYFSkEWF
z?(q)i%j^^H&Bd<_aob|67ms~?Iy;c-Y7Lw{>w4?c=g;+CKc5>OvwmoL(*3b7Jk!UD
z5InNDvz3a4cc1!eZ4L8*4?L~4*!u3nV~0GYR}YV_guIsLmJCL=um1FN_BY)7r@I>U
z;sfVG+g3H8;iV_Dm1MDcxvTYJY`tIj<Kcqd9}q4juHyK@?JrN9ype5=^)6Sj%e!8y
zUi$m^zW1?b@$R|La%>!2*j@?&@&xzpe%w28{pixJBLF{>oPT2)rxO+bNO<7*(>J5d
z!R1r#bd!42%{+dM&i60&Tw#Ysv5#DD-(G57yCV(#=mH<U;HvKJJ8<#$KC3y$kFM-p
tSiJSIIlt%X%=}AVJ%jfwcrbSl_FZ4B{Ov>M-*NsmnbbIcA@TC-{{W66mQerz

diff --git a/MyTracks/res/drawable-mdpi/x_axis.png b/MyTracks/res/drawable-mdpi/x_axis.png
deleted file mode 100644
index d7abf9a6027b8909d3dad26f3b2c77e33ddfc709..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8x#^NA%Cx&(BWL^R}OiAAEE)4(M
z`_JqL@;D1TB8wRqxP?KOkzv*x37{Z*iKnkC`)wXkF;zasUwVgtLP{mB5hc#~xw)x%
zB@E6*sfi`2DGKG8B^e6tp1uJJ`FRS73ciWS?JLTifvQV9T^vI!PQRU`$ag3}fc3d~
zrX|BFrf^R2=Mok!zL#5+3)rQMOa)lj;@-+{P22Q)6Tj9}FI7kT;?1u4+j9J${EpVY
z?^&1djALnvk<OOHv<0bN=h-R>e4nasFXFnl<kii4|Khg>mzK=Gk{qBfcjxHcZ(kRS
YZj>-Kza?mT4`@Gwr>mdKI;Vst004YlQ2+n{

diff --git a/MyTracks/res/drawable-mdpi/y_axis.png b/MyTracks/res/drawable-mdpi/y_axis.png
deleted file mode 100644
index 679025e7e7b8ff10b143ec28f6f103373a062a28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8x#^NA%Cx&(BWL^R}OiAAEE)4(M
z`_JqL@;D1TB8wRqxP?KOkzv*x37{Z*iKnkC`)wXkF;(5gbK^Gvg_KHMBTAg}b8}Pk
zN*J7rQWHy3QxwWGOEMJPJ$(Zd^79lD6?_wu+gFr3165~wx;TbdoPK*@BWHtw1na}@
zR=$MP#OGi767v<`J>csqC}ZPRJm_`e>d$}dj0|rMcuxKECgyJJrk%ZO7cXDsF1CGB
zx!Ja7A5W%7Yw^E7@8l6Fw?>g~`TuLRwu_dyGHBU_6dYs~|0DZ<3->pvs2%%5HpBoe
OW$<+Mb6Mw<&;$S!eqN0L

diff --git a/MyTracks/res/drawable-xhdpi/menu_chart_settings.png b/MyTracks/res/drawable-xhdpi/menu_chart_settings.png
deleted file mode 100644
index 3f93e4f655e4d92b44374dc32b9245265fff82b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1544
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Yk+G|zg^Qc1lYyI|p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaT(7GEPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$j9
z!D${;ZwgMgxVYlfs}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=ZAIb@M3$15=f!
zi(^Q|tv9pIYwIRT9KUaQ{Cqd-%E#{J(n~u$ygFN*f^<@jx^0|(J2o(>eMh&pqIGqu
z`pvub52oo%X<gd8sUS(hc%T3Ci!)Wy-JYGvepdM^*ed<ZobSfxe<wey<vCs$GUu=W
zqmlzl2ZNvjlS>1K0OQWbEK?YxKbxsKNbyuz?l^F~^K=Z;Bo+V7ZI|cPq%qDr+|O|P
zsB-+73oAZ)hF8B)VA0su!FlcA(lp5n9Cgj|j;Rfgto^o~KiHba<nu4L?LOmU<G?i!
zAADbVe@cKMKg<>sD;Zrf=dhME)fz0{+|a~uE|Nv<pw0@Ww+onZR-L(h%Y!?EVZVd@
zh68g??O8O7X=(!N9k;FAJdLpi3yj`B*ZFrRQSk5s{S}?F7`#5aZeYu@JbVA$Hj6)%
z>^InS0|f(kx9vE8+3sL)-(z_P;UCPqie<dl?|goc>Bq{~5)&S=-PL|STd*WY_6CFZ
zgDYQUd&P4Tn7$Oa1%7F?E%@PA)~a>j+3vU}pZ{wJp9)QDP8F5;yv34l*N@%qa@Hc;
z(a%1nvj4eWDfLClzos@yy{9p4>fOpJ>)2UyWcSWdbl-Dq$Io}(iQSu*PyJu_L*c0G
zJG(7kO?mkaaA^E|cb=)NuWi42?=Cmn@`V?7*zrW_=!!mH?s$9agGt8|1qBY7cmxM4
zPJVw&u{nK0$_%EAD67YxTLSak9<4ttQox#KBEj)l??8#JpN{XY%`^EK*PB{=u~;2F
z(`WIiYX+6_9yKCf|AKE?IeNd0R{I{Mar5_8$q5C%vzL0kcRJ}J5UcQ4wApXoHM5rr
myBt)UkrIHC!nTh}2N*8@*vewQ^WPm%+3e}+=d#Wzp$P!)e>pAy

diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
deleted file mode 100644
index 0df6d4eec..000000000
--- a/MyTracks/res/layout/chart_settings.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2009 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.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <TextView
-      android:drawableLeft="@drawable/x_axis"
-      android:text="@string/chart_settings_x_axis"
-      style="@style/TextLarge.WithIcon" />
-    <RadioGroup
-      android:id="@+id/chart_settings_x"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content" >
-      <RadioButton
-        android:id="@+id/chart_settings_by_distance"
-        android:text="@string/chart_settings_by_distance"
-        style="@style/TextMedium" />
-      <RadioButton
-        android:id="@+id/chart_settings_by_time"
-        android:text="@string/chart_settings_by_time"
-        style="@style/TextMedium" />
-    </RadioGroup>
-    <TextView
-      android:drawableLeft="@drawable/y_axis"
-      android:text="@string/chart_settings_y_axis"
-      style="@style/TextLarge.WithIcon" />
-    <CheckBox
-      android:id="@+id/chart_settings_elevation"
-      android:text="@string/stats_elevation"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_speed"
-      android:text="@string/stats_speed"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_power"
-      android:text="@string/sensor_state_power"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_cadence"
-      android:text="@string/sensor_state_cadence"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_heart_rate"
-      android:text="@string/sensor_state_heart_rate"
-      style="@style/TextMedium" />
-  </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 46809bb2a..90fc0e3ad 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -84,10 +84,6 @@ limitations under the License.
     android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
     android:title="@string/menu_sensor_state"/>
-  <item
-    android:icon="@drawable/menu_chart_settings"
-    android:id="@+id/track_detail_chart_settings"
-    android:title="@string/menu_chart_settings"/>
   <item
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_detail_settings"
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index ac28ec497..5b62883f2 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -25,6 +25,12 @@ limitations under the License.
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
   <string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
   <string name="bluetooth_sensor_key">bluetoothSensor</string>
+  <string name="chart_by_distance_key">chartByDistance</string>
+  <string name="chart_show_cadence_key">chartShowCadence</string>
+  <string name="chart_show_elevation_key">chartShowElevation</string>
+  <string name="chart_show_heart_rate_key">chartShowHeartRate</string>
+  <string name="chart_show_power_key">chartShowPower</string>
+  <string name="chart_show_speed_key">chartShowSpeed</string>
   <string name="default_activity_key">defaultActivity</string>
   <string name="default_map_public_key">defaultMapPublic</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
@@ -55,11 +61,11 @@ limitations under the License.
   <string name="track_color_mode_slow_key">trackColorModeSlow</string>
   <string name="track_color_mode_key">trackColorMode</string>
   <string name="track_name_key">trackName</string>
-
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="backup_to_sd_key">backupToSd</string>
   <string name="restore_from_sd_key">restoreFromSd</string>
   <string name="settings_backup_key">settingsBackup</string>
+  <string name="settings_chart_key">settingsChart</string>
   <string name="settings_map_key">settingsMap</string>
   <string name="settings_map_medium_display_key">settingsMapMediumDisplay</string>
   <string name="settings_map_percentage_display_key">settingsMapPercentageDisplay</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 68a7ec787..a0284c89d 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -416,30 +416,6 @@ limitations under the License.
     Record and share your GPS tracks with My Tracks.
   </string>
 
-  <!-- Chart Settings -->
-  <string name="chart_settings_by_distance"
-    translation_description="In the 'Chart settings' dialog, under the 'X axis' section, the radio
-      option to show the charts by distance. The other radio option is to show by time. User can
-      only choose one of the options.">
-    By distance
-  </string>
-  <string name="chart_settings_by_time"
-    translation_description="In the 'Chart settings' dialog, under the 'X axis' section, the radio
-      option to show the charts by time. The other radio option is to show by distance. User can
-      only choose one of the options.">
-    By time
-  </string>
-  <string name="chart_settings_x_axis"
-    translation_description="In the 'Chart settings' dialog, the section label for configuring the X
-      axis.">
-    X axis
-  </string>
-  <string name="chart_settings_y_axis"
-    translation_description="In the 'Chart settings' dialog, the section label for configuring the Y
-      axis.">
-    Y axis
-  </string>
-
   <!-- Description -->
   <string name="description_activity_type"
     translation_description="Activity type description.
@@ -1034,10 +1010,6 @@ limitations under the License.
     translation_description="In the menu, to go to the aggregated statistics page.">
     Aggregated statistics
   </string>
-  <string name="menu_chart_settings"
-    translation_description="In the menu, to change the chart settings.">
-    Chart settings
-  </string>
   <string name="menu_delete_all"
     translation_description="In the menu, to delete all the tracks.">
     Delete all
@@ -1521,6 +1493,22 @@ limitations under the License.
     Restore all tracks and settings from the SD card.
   </string>
 
+  <!-- Settings Chart -->
+  <string name="settings_chart_by_distance"
+    translation_description="In the 'Chart' settings, the option to display the x axis by
+      distance.">
+    By distance
+  </string>  
+  <string name="settings_chart_by_time"
+    translation_description="In the 'Chart' settings, the option to display the x axis by time.">
+    By time
+  </string>
+  <string name="settings_chart_x_axis"
+    translation_description="In the 'Chart' setttings, the option to change the x axis display,
+      either by distance or by time.">
+    X axis
+  </string>
+
   <!-- Settings Map -->
   <string name="settings_map_medium"
     translation_description="In the 'Map' settings, under the 'Fixed thresholds' configurations, the
@@ -1574,6 +1562,10 @@ limitations under the License.
   </string>
 
   <!-- Settings Others -->
+  <string name="settings_show"
+    translation_description="In settings, the section label to show additional values.">
+    Show
+  </string>
   <string name="settings_not_while_recording"
     translation_description="In settings, the summary for an option that is not available during a
       track recording.">
@@ -1986,10 +1978,6 @@ limitations under the License.
       either speed (mi/hr) or pace (hr/mi).">
     Preferred Rate
   </string>
-  <string name="settings_stats_show"
-    translation_description="In the 'Stats' settings, the section label to show additional stats.">
-    Show
-  </string>
   <string name="settings_stats_time_title"
     translation_description="In the 'Stats' settings, the option to change the time measurement,
       either total time or moving time.">
diff --git a/MyTracks/res/xml/chart_settings.xml b/MyTracks/res/xml/chart_settings.xml
new file mode 100644
index 000000000..011a75e5a
--- /dev/null
+++ b/MyTracks/res/xml/chart_settings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+  android:title="@string/track_detail_chart_tab" >
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:key="@string/chart_by_distance_key"
+    android:summaryOff="@string/settings_chart_by_time"
+    android:summaryOn="@string/settings_chart_by_distance"
+    android:title="@string/settings_chart_x_axis" />
+  <PreferenceCategory android:title="@string/settings_show" >
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_elevation_key"
+      android:title="@string/stats_elevation" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_speed_key" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_heart_rate_key"
+      android:title="@string/sensor_state_heart_rate" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_cadence_key"
+      android:title="@string/sensor_state_cadence" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_power_key"
+      android:title="@string/sensor_state_power" />
+  </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/MyTracks/res/xml/settings.xml b/MyTracks/res/xml/settings.xml
index 57e8361c0..ff24e55be 100644
--- a/MyTracks/res/xml/settings.xml
+++ b/MyTracks/res/xml/settings.xml
@@ -20,6 +20,10 @@ limitations under the License.
     android:key="@string/settings_map_key"
     android:persistent="false"
     android:title="@string/track_detail_map_tab" />
+  <Preference
+    android:key="@string/settings_chart_key"
+    android:persistent="false"
+    android:title="@string/track_detail_chart_tab" />
   <Preference
     android:key="@string/settings_stats_key"
     android:persistent="false"
diff --git a/MyTracks/res/xml/stats_settings.xml b/MyTracks/res/xml/stats_settings.xml
index b203dff09..9186c4a09 100644
--- a/MyTracks/res/xml/stats_settings.xml
+++ b/MyTracks/res/xml/stats_settings.xml
@@ -32,7 +32,7 @@ limitations under the License.
     android:summaryOff="@string/stats_total_time"
     android:summaryOn="@string/stats_moving_time"
     android:title="@string/settings_stats_time_title" />
-  <PreferenceCategory android:title="@string/settings_stats_show" >
+  <PreferenceCategory android:title="@string/settings_show" >
     <CheckBoxPreference
       android:defaultValue="false"
       android:key="@string/stats_show_elevation_key"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index a5169d830..af6c785fd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -156,12 +156,7 @@ public class ChartView extends View {
   private boolean metricUnits = true;
   private boolean showPointer = false;
 
-  /** Display chart versus distance or time */
-  public enum Mode {
-    BY_DISTANCE, BY_TIME
-  }
-
-  private Mode mode = Mode.BY_DISTANCE;
+  private boolean chartByDistance = true;
 
   public ChartView(Context context) {
     super(context);
@@ -394,22 +389,17 @@ public class ChartView extends View {
   }
 
   /**
-   * @return the current display mode (by distance, by time)
+   * Sets chart by distance value. It is expected that after changing this
+   * value, data will be reloaded.
+   * 
+   * @param value true for by distance, false for by time.
    */
-  public Mode getMode() {
-    return mode;
-  }
-
-  /**
-   * Sets the display mode (by distance, by time).
-   * It is expected that after the mode change, data will be reloaded.
-   */
-  public void setMode(Mode mode) {
-    this.mode = mode;
+  public void setChartByDistance(boolean value) {
+    this.chartByDistance = value;
   }
 
   private int getWaypointX(Waypoint waypoint) {
-    if (mode == Mode.BY_DISTANCE) {
+    if (chartByDistance) {
       double lenghtInKm = waypoint.getLength() * UnitConversions.M_TO_KM;
       return getX(metricUnits ? lenghtInKm : lenghtInKm * UnitConversions.KM_TO_MI);
     } else {
@@ -813,8 +803,7 @@ public class ChartView extends View {
     if (x < 0) {
       return;
     }
-    String s =
-        (mode == Mode.BY_DISTANCE)
+    String s = chartByDistance
             ? (shortFormat ? X_SHORT_FORMAT.format(x) : X_FORMAT.format(x))
             : StringUtils.formatElapsedTime((long) x);
     c.drawText(s,
@@ -841,7 +830,7 @@ public class ChartView extends View {
     final int y = effectiveHeight + topBorder;
     canvas.drawLine(leftBorder, y, rightEdge, y, borderPaint);
     Context c = getContext();
-    String s = mode == Mode.BY_DISTANCE
+    String s = chartByDistance
         ? (metricUnits ? c.getString(R.string.unit_kilometer) : c.getString(R.string.unit_mile))
         : c.getString(R.string.unit_minute);
     canvas.drawText(s, rightEdge, effectiveHeight + .2f * UNIT_BORDER + topBorder, labelPaint);
@@ -875,17 +864,6 @@ public class ChartView extends View {
     }
   }
 
-  /**
-   * Returns whether a given time series is enabled for drawing.
-   *
-   * @param index the time series, one of {@link #ELEVATION_SERIES},
-   *        {@link #SPEED_SERIES}, {@link #POWER_SERIES}, etc.
-   * @return true if drawn, false otherwise
-   */
-  public boolean isChartValueSeriesEnabled(int index) {
-    return series[index].isEnabled();
-  }
-
   /**
    * Sets whether a given time series will be enabled for drawing.
    *
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 6730240b4..f05398da3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -21,7 +21,6 @@ import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.fragments.ChartFragment;
-import com.google.android.apps.mytracks.fragments.ChartSettingsDialogFragment;
 import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment;
 import com.google.android.apps.mytracks.fragments.InstallEarthDialogFragment;
 import com.google.android.apps.mytracks.fragments.MapFragment;
@@ -231,8 +230,6 @@ public class TrackDetailActivity extends AbstractMyTracksActivity {
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
     String currentTabTag = tabHost.getCurrentTabTag();
-    menu.findItem(R.id.track_detail_chart_settings).setVisible(
-        ChartFragment.CHART_FRAGMENT_TAG.equals(currentTabTag));
     MenuItem satelliteMode = menu.findItem(R.id.track_detail_satellite_mode)
         .setVisible(MapFragment.MAP_FRAGMENT_TAG.equals(currentTabTag));
     
@@ -347,10 +344,6 @@ public class TrackDetailActivity extends AbstractMyTracksActivity {
         intent = IntentUtils.newIntent(this, SensorStateActivity.class);
         startActivity(intent);
         return true;
-      case R.id.track_detail_chart_settings:
-        new ChartSettingsDialogFragment().show(
-            getSupportFragmentManager(), ChartSettingsDialogFragment.CHART_SETTINGS_DIALOG_TAG);
-        return true;
       case R.id.track_detail_settings:
         intent = IntentUtils.newIntent(this, SettingsActivity.class);
         startActivity(intent);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
index 50de47cd5..2424a37ce 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
@@ -17,7 +17,6 @@
 package com.google.android.apps.mytracks.fragments;
 
 import com.google.android.apps.mytracks.ChartView;
-import com.google.android.apps.mytracks.ChartView.Mode;
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.MyTracksApplication;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
@@ -31,6 +30,7 @@ import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
 import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
 import com.google.android.apps.mytracks.util.LocationUtils;
+import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
@@ -76,6 +76,9 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   private boolean metricUnits = true;
   private boolean reportSpeed = true;
 
+  private boolean chartByDistance = true;
+  private boolean[] chartShow = new boolean[] {true, true, true, true, true};
+
   // UI elements
   private ChartView chartView;
   private ZoomControls zoomControls;
@@ -143,6 +146,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   public void onResume() {
     super.onResume();
     resumeTrackDataHub();
+    checkChartSettings();
     getActivity().runOnUiThread(updateChart);
   }
 
@@ -158,58 +162,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     ViewGroup layout = (ViewGroup) getActivity().findViewById(R.id.chart_view_layout);
     layout.removeView(chartView);
   }
- 
-  /**
-   * Sets the chart view mode.
-   * 
-   * @param mode the chart view mode
-   */
-  public void setMode(Mode mode) {
-    if (chartView.getMode() != mode) {
-      chartView.setMode(mode);
-      reloadTrackDataHub();
-    }
-  }
-
-  /**
-   * Gets the chart view mode.
-   */
-  public Mode getMode() {
-    return chartView.getMode();
-  }
-
-  /**
-   * Enables or disables the chart value series.
-   * 
-   * @param index the index of the series
-   * @param enabled true to enable, false to disable
-   */
-  public void setChartValueSeriesEnabled(int index, boolean enabled) {
-    chartView.setChartValueSeriesEnabled(index, enabled);
-  }
-
-  /**
-   * Returns true if the chart value series is enabled.
-   * 
-   * @param index the index of the series
-   */
-  public boolean isChartValueSeriesEnabled(int index) {
-    return chartView.isChartValueSeriesEnabled(index);
-  }
-
-  /**
-   * Returns true to report speed instead of pace.
-   */
-  public boolean isReportSpeed() {
-    return reportSpeed;
-  }
-
-  /**
-   * Updates the chart.
-   */
-  public void update() {
-    chartView.postInvalidate();
-  }
 
   @Override
   public void onProviderStateChange(ProviderState state) {
@@ -338,6 +290,60 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     return true;
   }
 
+  /**
+   * Checks the chart settings.
+   */
+  private void checkChartSettings() {
+    boolean needUpdate = false;
+    if (chartByDistance != PreferencesUtils.getBoolean(getActivity(),
+        R.string.chart_by_distance_key, PreferencesUtils.CHART_BY_DISTANCE_DEFAULT)) {
+      chartByDistance = !chartByDistance;
+      chartView.setChartByDistance(chartByDistance);
+      reloadTrackDataHub();
+      needUpdate = true;
+    }
+    if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.getBoolean(getActivity(),
+        R.string.chart_show_elevation_key, PreferencesUtils.CHART_SHOW_ELEVATION_DEFAULT))) {
+      needUpdate = true;
+    }
+    if (setSeriesEnabled(ChartView.SPEED_SERIES, PreferencesUtils.getBoolean(
+        getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT))) {
+      needUpdate = true;
+    }
+    if (setSeriesEnabled(ChartView.POWER_SERIES, PreferencesUtils.getBoolean(
+        getActivity(), R.string.chart_show_power_key, PreferencesUtils.CHART_SHOW_POWER_DEFAULT))) {
+      needUpdate = true;
+    }
+    if (setSeriesEnabled(ChartView.CADENCE_SERIES, PreferencesUtils.getBoolean(getActivity(),
+        R.string.chart_show_cadence_key, PreferencesUtils.CHART_SHOW_CADENCE_DEFAULT))) {
+      needUpdate = true;
+    }
+    if (setSeriesEnabled(ChartView.HEART_RATE_SERIES, PreferencesUtils.getBoolean(getActivity(),
+        R.string.chart_show_heart_rate_key, PreferencesUtils.CHART_SHOW_HEART_RATE_DEFAULT))) {
+      needUpdate = true;
+    }
+    if (needUpdate) {
+      chartView.postInvalidate();
+    }
+  }
+
+  /**
+   * Sets the series enabled value.
+   * 
+   * @param index the series index
+   * @param value the value
+   * @return true if changed
+   */
+  private boolean setSeriesEnabled(int index, boolean value) {
+    if (chartShow[index] != value) {
+      chartShow[index] = value;
+      chartView.setChartValueSeriesEnabled(index, value);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   /**
    * Resumes the trackDataHub. Needs to be synchronized because trackDataHub can be
    * accessed by multiple threads.
@@ -352,16 +358,16 @@ public class ChartFragment extends Fragment implements TrackDataListener {
         ListenerDataType.SAMPLED_OUT_POINT_UPDATES,
         ListenerDataType.DISPLAY_PREFERENCES));
   }
-  
+
   /**
-   * Pauses the trackDataHub. Needs to be synchronized because trackDataHub can be
-   * accessed by multiple threads. 
+   * Pauses the trackDataHub. Needs to be synchronized because trackDataHub can
+   * be accessed by multiple threads.
    */
   private synchronized void pauseTrackDataHub() {
     trackDataHub.unregisterTrackDataListener(this);
     trackDataHub = null;
   }
-  
+
   /**
    * Returns true if recording. Needs to be synchronized because trackDataHub
    * can be accessed by multiple threads.
@@ -369,7 +375,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   private synchronized boolean isRecording() {
     return trackDataHub != null && trackDataHub.isRecordingSelected();
   }
-  
+
   /**
    * Reloads the trackDataHub. Needs to be synchronized because trackDataHub can be
    * accessed by multiple threads. 
@@ -420,7 +426,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     double heartRate = Double.NaN;  
    
     // TODO: Use TripStatisticsBuilder
-    if (chartView.getMode() == Mode.BY_DISTANCE) {
+    if (chartByDistance) {
       if (lastLocation != null) {
         double distance = lastLocation.distanceTo(location) * UnitConversions.M_TO_KM;
         if (metricUnits) {
@@ -512,4 +518,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   void setReportSpeed(boolean value) {
     reportSpeed = value;
   }
+  @VisibleForTesting
+  void setChartByDistance(boolean value) {
+    chartByDistance = value;
+  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
deleted file mode 100644
index ddb9f81a2..000000000
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.ChartView;
-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;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.RadioGroup;
-
-/**
- * A DialogFragment to show chart settings.
- *
- * @author Jimmy Shih
- */
-public class ChartSettingsDialogFragment extends DialogFragment {
-
-  public static final String CHART_SETTINGS_DIALOG_TAG = "chartSettingsDialog";
-
-  @Override
-  public Dialog onCreateDialog(Bundle savedInstanceState) {
-    final ChartFragment chartFragment = (ChartFragment) getActivity()
-        .getSupportFragmentManager().findFragmentByTag(ChartFragment.CHART_FRAGMENT_TAG);
-    View view = getActivity().getLayoutInflater().inflate(R.layout.chart_settings, null);
-    final RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.chart_settings_x);
-    radioGroup.check(chartFragment.getMode() == ChartView.Mode.BY_DISTANCE
-        ? R.id.chart_settings_by_distance : R.id.chart_settings_by_time);
-
-    final CheckBox[] checkBoxes = new CheckBox[ChartView.NUM_SERIES];
-    checkBoxes[ChartView.ELEVATION_SERIES] = (CheckBox) view.findViewById(
-        R.id.chart_settings_elevation);
-    checkBoxes[ChartView.SPEED_SERIES] = (CheckBox) view.findViewById(R.id.chart_settings_speed);
-    checkBoxes[ChartView.POWER_SERIES] = (CheckBox) view.findViewById(R.id.chart_settings_power);
-    checkBoxes[ChartView.CADENCE_SERIES] = (CheckBox) view.findViewById(
-        R.id.chart_settings_cadence);
-    checkBoxes[ChartView.HEART_RATE_SERIES] = (CheckBox) view.findViewById(
-        R.id.chart_settings_heart_rate);
-
-    // set checkboxes values
-    for (int i = 0; i < ChartView.NUM_SERIES; i++) {
-      checkBoxes[i].setChecked(chartFragment.isChartValueSeriesEnabled(i));
-    }
-    checkBoxes[ChartView.SPEED_SERIES].setText(chartFragment.isReportSpeed()
-        ? R.string.stats_speed : R.string.stats_pace);
-
-    return new AlertDialog.Builder(getActivity())
-        .setNegativeButton(R.string.generic_cancel, null)
-        .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            chartFragment.setMode(
-                radioGroup.getCheckedRadioButtonId() == R.id.chart_settings_by_distance 
-                ? ChartView.Mode.BY_DISTANCE : ChartView.Mode.BY_TIME);
-            for (int i = 0; i < ChartView.NUM_SERIES; i++) {
-              chartFragment.setChartValueSeriesEnabled(i, checkBoxes[i].isChecked());
-            }
-            chartFragment.update();
-          }
-        })
-        .setTitle(R.string.menu_chart_settings)
-        .setView(view)
-        .create();
-  }
-}
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java
new file mode 100644
index 000000000..faab87cec
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java
@@ -0,0 +1,54 @@
+/*
+ * 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.settings;
+
+import com.google.android.apps.mytracks.util.PreferencesUtils;
+import com.google.android.maps.mytracks.R;
+
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+
+/**
+ * An activity for accessing chart settings.
+ * 
+ * @author Jimmy Shih
+ */
+public class ChartSettingsActivity extends AbstractSettingsActivity {
+
+  @SuppressWarnings("deprecation")
+  @Override
+  protected void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    addPreferencesFromResource(R.xml.chart_settings);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    updateUi();
+  }
+
+  @SuppressWarnings("deprecation")
+  private void updateUi() {
+    CheckBoxPreference speedCheckBoxPreference = (CheckBoxPreference) findPreference(
+        getString(R.string.chart_show_speed_key));
+    boolean reportSpeed = PreferencesUtils.getBoolean(
+        this, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
+    speedCheckBoxPreference.setTitle(reportSpeed ? R.string.stats_speed
+        : R.string.stats_pace);
+  }
+}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/SettingsActivity.java
index 8f4db81f6..cbea11e9e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/settings/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/SettingsActivity.java
@@ -62,6 +62,16 @@ public class SettingsActivity extends AbstractSettingsActivity {
       }
     });
 
+    Preference chartPreference = findPreference(getString(R.string.settings_chart_key));
+    chartPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+        @Override
+      public boolean onPreferenceClick(Preference preference) {
+        Intent intent = IntentUtils.newIntent(SettingsActivity.this, ChartSettingsActivity.class);
+        startActivity(intent);
+        return true;
+      }
+    });
+
     Preference statsPreference = findPreference(getString(R.string.settings_stats_key));
     statsPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
         @Override
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 dbf70f7f5..b6292b5d4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
@@ -42,6 +42,14 @@ public class PreferencesUtils {
   public static final int AUTO_RESUME_TRACK_TIMEOUT_NEVER = 0;
 
   public static final String BLUETOOTH_SENSOR_DEFAULT = "";
+
+  public static final boolean CHART_BY_DISTANCE_DEFAULT = true;
+  public static final boolean CHART_SHOW_CADENCE_DEFAULT = true;
+  public static final boolean CHART_SHOW_ELEVATION_DEFAULT = true;
+  public static final boolean CHART_SHOW_HEART_RATE_DEFAULT = true;
+  public static final boolean CHART_SHOW_POWER_DEFAULT = true;
+  public static final boolean CHART_SHOW_SPEED_DEFAULT = true;
+
   public static final String DEFAULT_ACTIVITY_DEFAULT = "";
   public static final boolean DEFAULT_MAP_PUBLIC_DEFAULT = true;
   public static final int MAX_RECORDING_DISTANCE_DEFAULT = 200;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java
index c1d0c8a57..f171510a6 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java
@@ -120,7 +120,7 @@ public class ChartFragmentTest extends AndroidTestCase {
    */
   public void testFillDataPoint_distanceMetric() {
     // By distance.
-    chartFragment.getChartView().setMode(ChartView.Mode.BY_DISTANCE);
+    chartFragment.setChartByDistance(true);
     // Resets last location and writes first location.
     MyTracksLocation myTracksLocation1 = TrackStubUtils.createMyTracksLocation();
     double[] point = fillDataPointTestHelper(myTracksLocation1);
@@ -160,6 +160,8 @@ public class ChartFragmentTest extends AndroidTestCase {
    * {@link ChartFragment#fillDataPoint(Location, double[])}.
    */
   public void testFillDataPoint_distanceImperial() {
+    // By distance.
+    chartFragment.setChartByDistance(true);
     // Setups to use imperial.
     chartFragment.setMetricUnits(false);
 
@@ -204,7 +206,7 @@ public class ChartFragmentTest extends AndroidTestCase {
    */
   public void testFillDataPoint_time() {
     // By time
-    chartFragment.getChartView().setMode(ChartView.Mode.BY_TIME);
+    chartFragment.setChartByDistance(false);
     MyTracksLocation myTracksLocation1 = TrackStubUtils.createMyTracksLocation();
     double[] point = fillDataPointTestHelper(myTracksLocation1);
     assertEquals(0.0, point[0]);