Remove api level 7 code.

MyTracks/src/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java

@@ -25,12 +25,15 @@ import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Context;
+import android.media.AudioManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import java.util.HashMap;
 import java.util.Locale;
 
 /**
@@ -49,8 +52,24 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
   private static final String TAG = AnnouncementPeriodicTask.class.getSimpleName();
   private static final long HOUR_TO_MILLISECOND = 60 * 60 * 1000;
 
+  private static final HashMap<String, String> SPEECH_PARAMS = new HashMap<String, String>();
+  static {
+    SPEECH_PARAMS.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "not_used");
+  }
+
+  private final OnUtteranceCompletedListener
+      utteranceListener = new OnUtteranceCompletedListener() {
+          @Override
+        public void onUtteranceCompleted(String utteranceId) {
+          int result = audioManager.abandonAudioFocus(null);
+          if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
+            Log.w(TAG, "Failed to relinquish audio focus.");
+          }
+        }
+      };
+
   private final Context context;
-  protected TextToSpeech tts;
+  private TextToSpeech tts;
 
   // Response from TTS after its initialization
   private int initStatus = TextToSpeech.ERROR;
@@ -61,6 +80,8 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
   // True if speech is allowed
   private boolean speechAllowed;
 
+  private final AudioManager audioManager;
+
   /**
    * Listener which updates {@link #speechAllowed} when the phone state changes.
    */
@@ -77,6 +98,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
 
   public AnnouncementPeriodicTask(Context context) {
     this.context = context;
+    audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
   }
 
   @Override
@@ -146,7 +168,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
   /**
    * Called when TTS is ready.
    */
-  protected void onTtsReady() {
+  private void onTtsReady() {
     Locale locale = Locale.getDefault();
     int languageAvailability = tts.isLanguageAvailable(locale);
     if (languageAvailability == TextToSpeech.LANG_MISSING_DATA
@@ -163,6 +185,8 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
 
     // Slow down the speed just a bit as it is hard to hear when exercising.
     tts.setSpeechRate(TTS_SPEECH_RATE);
+
+    tts.setOnUtteranceCompletedListener(utteranceListener);
   }
 
   /**
@@ -170,8 +194,18 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
    * 
    * @param announcement the announcement
    */
-  protected void speakAnnouncement(String announcement) {
-    tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, null);
+  private void speakAnnouncement(String announcement) {
+    int result = audioManager.requestAudioFocus(
+        null, TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
+    if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
+      Log.w(TAG, "Failed to request audio focus.");
+    }
+
+    /*
+     * We don't care about the utterance id. It is supplied here to force
+     * onUtteranceCompleted to be called.
+     */
+    tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, SPEECH_PARAMS);
   }
 
   /**
@@ -224,8 +258,8 @@ public class AnnouncementPeriodicTask implements PeriodicTask {
     String totalDistance = context.getResources()
         .getQuantityString(totalDistanceId, getQuantityCount(distance), distance);
 
-    return context.getString(R.string.voice_template, totalDistance, getAnnounceTime(
-        tripStatistics.getMovingTime()), rate);
+    return context.getString(R.string.voice_template, totalDistance,
+        getAnnounceTime(tripStatistics.getMovingTime()), rate);
   }
 
   /**

MyTracks/src/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java

@@ -15,8 +15,6 @@
  */
 package com.google.android.apps.mytracks.services.tasks;
 
-import com.google.android.apps.mytracks.util.ApiAdapterFactory;
-
 import android.content.Context;
 
 /**
@@ -28,6 +26,6 @@ public class AnnouncementPeriodicTaskFactory implements PeriodicTaskFactory {
 
   @Override
   public PeriodicTask create(Context context) {
-    return ApiAdapterFactory.getApiAdapter().getAnnouncementPeriodicTask(context);
+    return new AnnouncementPeriodicTask(context);
   }
 }

MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8AnnouncementPeriodicTask.java

@@ -1,81 +0,0 @@
-/*
- * Copyright 2011 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.services.tasks;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.media.AudioManager;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener;
-import android.util.Log;
-
-import java.util.HashMap;
-
-/**
- * This class will periodically announce the user's trip statistics. This class
- * will request and release audio focus.
- * 
- * @author Sandor Dornbush
- */
-@TargetApi(8)
-public class Api8AnnouncementPeriodicTask extends AnnouncementPeriodicTask {
-
-  private static final String TAG = Api8AnnouncementPeriodicTask.class.getSimpleName();
-  private static final HashMap<String, String> SPEECH_PARAMS = new HashMap<String, String>();
-  static {
-    SPEECH_PARAMS.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "not_used");
-  }
-
-  private final OnUtteranceCompletedListener
-      utteranceListener = new OnUtteranceCompletedListener() {
-          @Override
-        public void onUtteranceCompleted(String utteranceId) {
-          int result = audioManager.abandonAudioFocus(null);
-          if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-            Log.w(TAG, "Failed to relinquish audio focus.");
-          }
-        }
-      };
-
-  private final AudioManager audioManager;
-
-  public Api8AnnouncementPeriodicTask(Context context) {
-    super(context);
-    audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-  }
-
-  @Override
-  protected void onTtsReady() {
-    super.onTtsReady();
-    tts.setOnUtteranceCompletedListener(utteranceListener);
-  }
-
-  @Override
-  protected synchronized void speakAnnouncement(String announcement) {
-    int result = audioManager.requestAudioFocus(
-        null, TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
-    if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
-      Log.w(TAG, "Failed to request audio focus.");
-    }
-
-    /*
-     * We don't care about the utterance id. It is supplied here to force
-     * onUtteranceCompleted to be called.
-     */
-    tts.speak(announcement, TextToSpeech.QUEUE_FLUSH, SPEECH_PARAMS);
-  }
-}