Merge branch 'master' into refactor_detailsactivity

ruleant · Nov 12, 2013 · 9b7e351 · 9b7e351
2 parents b0b5fea + 86f4041
commit 9b7e351
Show file tree

Hide file tree

Showing 64 changed files with 455 additions and 1,150 deletions.
diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html
@@ -2,18 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_25) on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_25) on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>All Classes (Ariadne 0.1-dev API)</title>
-<meta name="date" content="2013-11-04">
+<meta name="date" content="2013-11-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
 <h1 class="bar">All Classes</h1>
 <div class="indexContainer">
 <ul>
 <li><a href="org/ruleant/ariadne/AboutActivity.html" title="class in org.ruleant.ariadne" target="classFrame">AboutActivity</a></li>
-<li><a href="org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne" target="classFrame">AbstractAriadneActivity</a></li>
 <li><a href="org/ruleant/ariadne/lib/AbstractGeoCoordinate.html" title="class in org.ruleant.ariadne.lib" target="classFrame">AbstractGeoCoordinate</a></li>
 <li><a href="org/ruleant/ariadne/lib/AriadneLocation.html" title="class in org.ruleant.ariadne.lib" target="classFrame">AriadneLocation</a></li>
 <li><a href="org/ruleant/ariadne/lib/DebugLevel.html" title="class in org.ruleant.ariadne.lib" target="classFrame">DebugLevel</a></li>

diff --git a/doc/allclasses-noframe.html b/doc/allclasses-noframe.html
@@ -2,18 +2,17 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_25) on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_25) on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>All Classes (Ariadne 0.1-dev API)</title>
-<meta name="date" content="2013-11-04">
+<meta name="date" content="2013-11-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
 <h1 class="bar">All Classes</h1>
 <div class="indexContainer">
 <ul>
 <li><a href="org/ruleant/ariadne/AboutActivity.html" title="class in org.ruleant.ariadne">AboutActivity</a></li>
-<li><a href="org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></li>
 <li><a href="org/ruleant/ariadne/lib/AbstractGeoCoordinate.html" title="class in org.ruleant.ariadne.lib">AbstractGeoCoordinate</a></li>
 <li><a href="org/ruleant/ariadne/lib/AriadneLocation.html" title="class in org.ruleant.ariadne.lib">AriadneLocation</a></li>
 <li><a href="org/ruleant/ariadne/lib/DebugLevel.html" title="class in org.ruleant.ariadne.lib">DebugLevel</a></li>

diff --git a/doc/constant-values.html b/doc/constant-values.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_25) on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_25) on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Constant Field Values (Ariadne 0.1-dev API)</title>
-<meta name="date" content="2013-11-04">
+<meta name="date" content="2013-11-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_25) on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_25) on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Deprecated List (Ariadne 0.1-dev API)</title>
-<meta name="date" content="2013-11-04">
+<meta name="date" content="2013-11-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/doc/help-doc.html b/doc/help-doc.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_25) on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_25) on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>API Help (Ariadne 0.1-dev API)</title>
-<meta name="date" content="2013-11-04">
+<meta name="date" content="2013-11-12">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/doc/index-all.html b/doc/index-all.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_25) on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_25) on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Index (Ariadne 0.1-dev API)</title>
-<meta name="date" content="2013-11-04">
+<meta name="date" content="2013-11-12">
 <link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
 </head>
 <body>
@@ -75,13 +75,6 @@ <h2 class="title">A</h2>
 </dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/AboutActivity.html#AboutActivity()">AboutActivity()</a></span> - Constructor for class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AboutActivity.html" title="class in org.ruleant.ariadne">AboutActivity</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne"><span class="strong">AbstractAriadneActivity</span></a> - Class in <a href="./org/ruleant/ariadne/package-summary.html">org.ruleant.ariadne</a></dt>
-<dd>
-<div class="block">Abstract Ariadne Activity class, contains the common methods
- to connect to LocationService.</div>
-</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#AbstractAriadneActivity()">AbstractAriadneActivity()</a></span> - Constructor for class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="./org/ruleant/ariadne/lib/AbstractGeoCoordinate.html" title="class in org.ruleant.ariadne.lib"><span class="strong">AbstractGeoCoordinate</span></a> - Class in <a href="./org/ruleant/ariadne/lib/package-summary.html">org.ruleant.ariadne.lib</a></dt>
 <dd>
 <div class="block">Abstract class for formatting a geological coordinate.</div>
@@ -183,18 +176,6 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Mode disabled.</div>
 </dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#displayAbout(android.view.MenuItem)">displayAbout(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Called when the user clicks the About menu item.</div>
-</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/MainActivity.html#displayDetails(android.view.MenuItem)">displayDetails(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/MainActivity.html" title="class in org.ruleant.ariadne">MainActivity</a></dt>
-<dd>
-<div class="block">Called when the user clicks the About menu item.</div>
-</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#displaySettings(android.view.MenuItem)">displaySettings(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Called when the user clicks the Settings menu item.</div>
-</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/lib/Navigator.html#DIST_ZERO">DIST_ZERO</a></span> - Static variable in class org.ruleant.ariadne.lib.<a href="./org/ruleant/ariadne/lib/Navigator.html" title="class in org.ruleant.ariadne.lib">Navigator</a></dt>
 <dd>
 <div class="block">Zero distance.</div>
@@ -368,10 +349,6 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Get segment unit, E for SEGMENT_EAST, W for SEGMENT_WEST.</div>
 </dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#getService()">getService()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Returns Location Service.</div>
-</dd>
 <dt><span class="strong"><a href="./org/ruleant/unitconversion/UnitConversionInterface.html#getUnit()">getUnit()</a></span> - Method in interface org.ruleant.unitconversion.<a href="./org/ruleant/unitconversion/UnitConversionInterface.html" title="interface in org.ruleant.unitconversion">UnitConversionInterface</a></dt>
 <dd>
 <div class="block">Returns a localized string of the current output unit.</div>
@@ -414,10 +391,6 @@ <h2 class="title">I</h2>
  not equal to the previous location
  and if the distance between the two is larger than the accuracy.</div>
 </dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#isBound()">isBound()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Returns bound state to Location Service.</div>
-</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/lib/Navigator.html#isLocationAccurate()">isLocationAccurate()</a></span> - Method in class org.ruleant.ariadne.lib.<a href="./org/ruleant/ariadne/lib/Navigator.html" title="class in org.ruleant.ariadne.lib">Navigator</a></dt>
 <dd>
 <div class="block">Determines if current location is accurate,
@@ -549,8 +522,6 @@ <h2 class="title">O</h2>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/SettingsActivity.html#onBuildHeaders(java.util.List)">onBuildHeaders(List&lt;PreferenceActivity.Header&gt;)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/SettingsActivity.html" title="class in org.ruleant.ariadne">SettingsActivity</a></dt>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/AboutActivity.html#onCreate(android.os.Bundle)">onCreate(Bundle)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AboutActivity.html" title="class in org.ruleant.ariadne">AboutActivity</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onCreate(android.os.Bundle)">onCreate(Bundle)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/DetailsActivity.html#onCreate(android.os.Bundle)">onCreate(Bundle)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/DetailsActivity.html" title="class in org.ruleant.ariadne">DetailsActivity</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/LocationService.html#onCreate()">onCreate()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/LocationService.html" title="class in org.ruleant.ariadne">LocationService</a></dt>
@@ -561,31 +532,21 @@ <h2 class="title">O</h2>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/SettingsActivity.GeneralPreferenceFragment.html#onCreate(android.os.Bundle)">onCreate(Bundle)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/SettingsActivity.GeneralPreferenceFragment.html" title="class in org.ruleant.ariadne">SettingsActivity.GeneralPreferenceFragment</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onCreateOptionsMenu(android.view.Menu)">onCreateOptionsMenu(Menu)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/MainActivity.html#onCreateOptionsMenu(android.view.Menu)">onCreateOptionsMenu(Menu)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/MainActivity.html" title="class in org.ruleant.ariadne">MainActivity</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onDestroy()">onDestroy()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/LocationService.html#onDestroy()">onDestroy()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/LocationService.html" title="class in org.ruleant.ariadne">LocationService</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/NavigationView.html#onDraw(android.graphics.Canvas)">onDraw(Canvas)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/NavigationView.html" title="class in org.ruleant.ariadne">NavigationView</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/SettingsActivity.html#onIsMultiPane()">onIsMultiPane()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/SettingsActivity.html" title="class in org.ruleant.ariadne">SettingsActivity</a></dt>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onOptionsItemSelected(android.view.MenuItem)">onOptionsItemSelected(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/MainActivity.html#onOptionsItemSelected(android.view.MenuItem)">onOptionsItemSelected(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/MainActivity.html" title="class in org.ruleant.ariadne">MainActivity</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/SettingsActivity.html#onPostCreate(android.os.Bundle)">onPostCreate(Bundle)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/SettingsActivity.html" title="class in org.ruleant.ariadne">SettingsActivity</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onPrepareOptionsMenu(android.view.Menu)">onPrepareOptionsMenu(Menu)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onStart()">onStart()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
+<dt><span class="strong"><a href="./org/ruleant/ariadne/MainActivity.html#onPrepareOptionsMenu(android.view.Menu)">onPrepareOptionsMenu(Menu)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/MainActivity.html" title="class in org.ruleant.ariadne">MainActivity</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/LocationService.html#onStartCommand(android.content.Intent, int, int)">onStartCommand(Intent, int, int)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/LocationService.html" title="class in org.ruleant.ariadne">LocationService</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#onStop()">onStop()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/LocationService.html#onUnbind(android.content.Intent)">onUnbind(Intent)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/LocationService.html" title="class in org.ruleant.ariadne">LocationService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="./org/ruleant/ariadne/package-summary.html">org.ruleant.ariadne</a> - package org.ruleant.ariadne</dt>
@@ -630,18 +591,6 @@ <h2 class="title">P</h2>
 </a>
 <h2 class="title">R</h2>
 <dl>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#refresh(android.view.MenuItem)">refresh(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Called when the user clicks the refresh menu item.</div>
-</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#refreshCrouton()">refreshCrouton()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Update which crouton should be displayed.</div>
-</dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#refreshDisplay()">refreshDisplay()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Refresh display : refresh the values of Location Provider, Location, ...</div>
-</dd>
 <dt><span class="strong"><a href="./org/ruleant/ariadne/DetailsActivity.html#refreshDisplay()">refreshDisplay()</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/DetailsActivity.html" title="class in org.ruleant.ariadne">DetailsActivity</a></dt>
 <dd>
 <div class="block">Refresh display : refresh the values of Location Provider, Location, ...</div>
@@ -849,10 +798,6 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Constructor.</div>
 </dd>
-<dt><span class="strong"><a href="./org/ruleant/ariadne/AbstractAriadneActivity.html#storeLocation(android.view.MenuItem)">storeLocation(MenuItem)</a></span> - Method in class org.ruleant.ariadne.<a href="./org/ruleant/ariadne/AbstractAriadneActivity.html" title="class in org.ruleant.ariadne">AbstractAriadneActivity</a></dt>
-<dd>
-<div class="block">Called when the user clicks the Store Location menu item.</div>
-</dd>
 </dl>
 <a name="_T_">
 <!--   -->

diff --git a/doc/index.html b/doc/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc on Mon Nov 04 19:36:09 CET 2013 -->
+<!-- Generated by javadoc on Tue Nov 12 20:18:27 CET 2013 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
 <title>Ariadne 0.1-dev API</title>
 <script type="text/javascript">