[FM] Fix typo of anntenna to antenna

    There are many typos of antenna (e.g. ANNTENNA, anntenna).

    The CL is to fix the typos.

    Bug: 18737759

    Review: https://partner-android-review.git.corp.google.com/#/c/188580

    Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: Ic8454a4b9678d60a734a59af65d6bbefbca1411a

4 files changed, 19 insertions, 19 deletions

diff --git a/src/com/android/fmradio/FmFavoriteActivity.java b/src/com/android/fmradio/FmFavoriteActivity.java
index b7b4a21..a376149 100644
--- a/src/com/android/fmradio/FmFavoriteActivity.java
+++ b/src/com/android/fmradio/FmFavoriteActivity.java
@@ -506,9 +506,9 @@ public class FmFavoriteActivity extends Activity {
                             + String.valueOf(searchedNum);
                     Toast.makeText(mContext, text, Toast.LENGTH_SHORT).show();
                     break;
-                case FmListener.MSGID_SWITCH_ANNTENNA:
+                case FmListener.MSGID_SWITCH_ANTENNA:
                     bundle = msg.getData();
-                    boolean isHeadset = bundle.getBoolean(FmListener.KEY_IS_SWITCH_ANNTENNA);
+                    boolean isHeadset = bundle.getBoolean(FmListener.KEY_IS_SWITCH_ANTENNA);
                     // if receive headset plugout, need set headset mode on ui
                     if (!isHeadset) {
                         finish();
diff --git a/src/com/android/fmradio/FmListener.java b/src/com/android/fmradio/FmListener.java
index 6ab2baf..e060c52 100644
--- a/src/com/android/fmradio/FmListener.java
+++ b/src/com/android/fmradio/FmListener.java
@@ -48,9 +48,9 @@ public interface FmListener {
     int LISTEN_SPEAKER_MODE_CHANGED = 0x00101000; // 1052672
 
     // Bundle keys
-    String SWITCH_ANNTENNA_VALUE = "switch_anntenna_value";
+    String SWITCH_ANTENNA_VALUE = "switch_antenna_value";
     String CALLBACK_FLAG = "callback_flag";
-    String KEY_IS_SWITCH_ANNTENNA = "key_is_switch_anntenna";
+    String KEY_IS_SWITCH_ANTENNA = "key_is_switch_antenna";
     String KEY_IS_TUNE = "key_is_tune";
     String KEY_TUNE_TO_STATION = "key_tune_to_station";
     String KEY_IS_SEEK = "key_is_seek";
@@ -79,7 +79,7 @@ public interface FmListener {
     int MSGID_UPDATE_RDS = 1;
     int MSGID_UPDATE_CURRENT_STATION = 2;
     int MSGID_ANTENNA_UNAVAILABE = 3;
-    int MSGID_SWITCH_ANNTENNA = 4;
+    int MSGID_SWITCH_ANTENNA = 4;
     int MSGID_SET_RDS_FINISHED = 5;
     int MSGID_SET_CHANNEL_FINISHED = 6;
     int MSGID_SET_MUTE_FINISHED = 7;
diff --git a/src/com/android/fmradio/FmMainActivity.java b/src/com/android/fmradio/FmMainActivity.java
index 444ff2c..5eadedf 100644
--- a/src/com/android/fmradio/FmMainActivity.java
+++ b/src/com/android/fmradio/FmMainActivity.java
@@ -240,11 +240,11 @@ public class FmMainActivity extends Activity implements FmFavoriteEditDialog.Edi
                     refreshPlayButton(true);
                     break;
 
-                case FmListener.MSGID_SWITCH_ANNTENNA:
+                case FmListener.MSGID_SWITCH_ANTENNA:
                     bundle = msg.getData();
-                    boolean hasAnntenna = bundle.getBoolean(FmListener.KEY_IS_SWITCH_ANNTENNA);
+                    boolean hasAntenna = bundle.getBoolean(FmListener.KEY_IS_SWITCH_ANTENNA);
                     // if receive headset plug out, need set headset mode on ui
-                    if (hasAnntenna) {
+                    if (hasAntenna) {
                         playMainAnimation();
                     } else {
                         mMenuItemHeadset.setIcon(R.drawable.btn_fm_headset_selector);
diff --git a/src/com/android/fmradio/FmService.java b/src/com/android/fmradio/FmService.java
index 236dfdf..af5eb9b 100644
--- a/src/com/android/fmradio/FmService.java
+++ b/src/com/android/fmradio/FmService.java
@@ -1022,11 +1022,11 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
      */
     public void switchAntennaAsync(int antenna) {
         final int bundleSize = 1;
-        mFmServiceHandler.removeMessages(FmListener.MSGID_SWITCH_ANNTENNA);
+        mFmServiceHandler.removeMessages(FmListener.MSGID_SWITCH_ANTENNA);
 
         Bundle bundle = new Bundle(bundleSize);
-        bundle.putInt(FmListener.SWITCH_ANNTENNA_VALUE, antenna);
-        Message msg = mFmServiceHandler.obtainMessage(FmListener.MSGID_SWITCH_ANNTENNA);
+        bundle.putInt(FmListener.SWITCH_ANTENNA_VALUE, antenna);
+        Message msg = mFmServiceHandler.obtainMessage(FmListener.MSGID_SWITCH_ANTENNA);
         msg.setData(bundle);
         mFmServiceHandler.sendMessage(msg);
     }
@@ -2413,9 +2413,9 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
                     break;
 
                 // switch antenna
-                case FmListener.MSGID_SWITCH_ANNTENNA:
+                case FmListener.MSGID_SWITCH_ANTENNA:
                     bundle = msg.getData();
-                    int value = bundle.getInt(FmListener.SWITCH_ANNTENNA_VALUE);
+                    int value = bundle.getInt(FmListener.SWITCH_ANTENNA_VALUE);
 
                     // if ear phone insert, need dismiss plugin earphone
                     // dialog
@@ -2424,8 +2424,8 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
                     if (0 == value) {
                         // powerUpAsync(FMRadioUtils.computeFrequency(mCurrentStation));
                         bundle.putInt(FmListener.CALLBACK_FLAG,
-                                FmListener.MSGID_SWITCH_ANNTENNA);
-                        bundle.putBoolean(FmListener.KEY_IS_SWITCH_ANNTENNA, true);
+                                FmListener.MSGID_SWITCH_ANTENNA);
+                        bundle.putBoolean(FmListener.KEY_IS_SWITCH_ANTENNA, true);
                         notifyActivityStateChanged(bundle);
                     } else {
                         // ear phone plug out, and recorder state is not
@@ -2433,8 +2433,8 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
                         // show dialog.
                         if (mRecordState != FmRecorder.STATE_PLAYBACK) {
                             bundle.putInt(FmListener.CALLBACK_FLAG,
-                                    FmListener.MSGID_SWITCH_ANNTENNA);
-                            bundle.putBoolean(FmListener.KEY_IS_SWITCH_ANNTENNA, false);
+                                    FmListener.MSGID_SWITCH_ANTENNA);
+                            bundle.putBoolean(FmListener.KEY_IS_SWITCH_ANTENNA, false);
                             notifyActivityStateChanged(bundle);
                         }
                     }
@@ -2593,8 +2593,8 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
         if (!isAntennaAvailable()) {
             Log.d(TAG, "handlePowerUp, earphone is not ready");
             bundle = new Bundle(2);
-            bundle.putInt(FmListener.CALLBACK_FLAG, FmListener.MSGID_SWITCH_ANNTENNA);
-            bundle.putBoolean(FmListener.KEY_IS_SWITCH_ANNTENNA, false);
+            bundle.putInt(FmListener.CALLBACK_FLAG, FmListener.MSGID_SWITCH_ANTENNA);
+            bundle.putBoolean(FmListener.KEY_IS_SWITCH_ANTENNA, false);
             notifyActivityStateChanged(bundle);
             return;
         }