clean up start/stop logic.

Signed-off-by: Mike Lockwood <lockwood@android.com>
CUTR-at-USF · Oct 7, 2009 · 5db01e3 · 5db01e3
1 parent 7b20562
commit 5db01e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/src/com/android/gpstest/GpsStatusActivity.java b/src/com/android/gpstest/GpsStatusActivity.java
@@ -233,7 +233,7 @@ public void onCreate(Bundle icicle) {
         GpsTestActivity.getInstance().addSubActivity(this);
     }
 
-    private void setNavigating(boolean navigating) {
+    private void setStarted(boolean navigating) {
         if (navigating != mNavigating) {
             if (navigating) {
 
@@ -267,15 +267,15 @@ private void updateFixTime() {
     public void onResume() {
         super.onResume();
         GpsTestActivity gta = GpsTestActivity.getInstance();
-        setNavigating(gta.mNavigating);
+        setStarted(gta.mStarted);
     }
 
     public void onGpsStarted() {
-        setNavigating(true);
+        setStarted(true);
     }
 
     public void onGpsStopped() {
-        setNavigating(false);
+        setStarted(false);
     }
 
     public void gpsStart() {
@@ -296,11 +296,11 @@ public void onFirstFix(int ttff) {
     public void onGpsStatusChanged(int event, GpsStatus status) {
         switch (event) {
             case GpsStatus.GPS_EVENT_STARTED:
-                setNavigating(true);
+                setStarted(true);
                 break;
 
             case GpsStatus.GPS_EVENT_STOPPED:
-                setNavigating(false);
+                setStarted(false);
                 break;
 
             case GpsStatus.GPS_EVENT_FIRST_FIX:
@@ -321,7 +321,7 @@ public void onGpsStatusChanged(int event, GpsStatus status) {
 
     private void updateStatus(GpsStatus status) {
 
-        setNavigating(true);
+        setStarted(true);
         // update the fix time regularly, since it is displaying relative time
         updateFixTime();
 

diff --git a/src/com/android/gpstest/GpsTestActivity.java b/src/com/android/gpstest/GpsTestActivity.java
@@ -43,10 +43,9 @@ public class GpsTestActivity extends TabActivity
     private LocationProvider mProvider;
     private GpsStatus mStatus;
     private ArrayList<SubActivity> mSubActivities = new ArrayList<SubActivity>();
-    boolean mNavigating;
     boolean mStarted;
     private Location mLastLocation;
- 
+
     private static GpsTestActivity sInstance;
 
     interface SubActivity extends LocationListener {
@@ -64,7 +63,7 @@ void addSubActivity(SubActivity activity) {
     }
 
     private void gpsStart() {
-        if (!mNavigating) {
+        if (!mStarted) {
             mService.requestLocationUpdates(mProvider.getName(), 1000, 0.0f, this);
             mStarted = true;
         }
@@ -74,7 +73,7 @@ private void gpsStart() {
     }
 
     private void gpsStop() {
-        if (mNavigating) {
+        if (mStarted) {
             mService.removeUpdates(this);
             mStarted = false;
         }
@@ -133,7 +132,7 @@ boolean createOptionsMenu(Menu menu) {
     boolean prepareOptionsMenu(Menu menu) {
         MenuItem item = menu.findItem(R.id.gps_start);
         if (item != null) {
-            if (mNavigating) {
+            if (mStarted) {
                 item.setTitle(R.string.gps_stop);
             } else {
                 item.setTitle(R.string.gps_start);
@@ -142,7 +141,7 @@ boolean prepareOptionsMenu(Menu menu) {
 
         item = menu.findItem(R.id.delete_aiding_data);
         if (item != null) {
-            item.setEnabled(!mNavigating);
+            item.setEnabled(!mStarted);
         }
 
         item = menu.findItem(R.id.send_location);
@@ -156,7 +155,7 @@ boolean prepareOptionsMenu(Menu menu) {
     boolean optionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.gps_start:
-                if (mNavigating) {
+                if (mStarted) {
                     gpsStop();
                 } else {
                     gpsStart();
@@ -211,18 +210,6 @@ public void onProviderDisabled(String provider) {
 
     public void onGpsStatusChanged(int event) {
         mStatus = mService.getGpsStatus(mStatus);
-        switch (event) {
-            case GpsStatus.GPS_EVENT_SATELLITE_STATUS:
-            case GpsStatus.GPS_EVENT_FIRST_FIX:
-            case GpsStatus.GPS_EVENT_STARTED:
-                mNavigating = true;
-                break;
-
-            case GpsStatus.GPS_EVENT_STOPPED:
-                mNavigating = false;
-                break;
-        }
-
         for (SubActivity activity : mSubActivities) {
             activity.onGpsStatusChanged(event, mStatus);
         }