Improve strings.

Also removed weird toast position code.

Change-Id: I917a35f228e1ca765802f73a2d654a3bf9311578

3 files changed, 23 insertions, 33 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index f84117b7..e4f0c58f 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -38,4 +38,13 @@
     <!-- CallCardFragement operator names -->
     <string name="sub_no_sim">No SIM</string>
     <string name="multi_sim_entry_format" translatable="false"><xliff:g id="operator">%1$s</xliff:g>-<xliff:g id="index">%2$d</xliff:g></string>
+
+    <!-- Set Subscription screen: label sub 1 -->
+    <string name="sub_1">SIM 1</string>
+    <!-- Set Subscription screen: label sub 2 -->
+    <string name="sub_2">SIM 2</string>
+
+    <string name="volume_boost_notify_enabled">Volume boost is now ON</string>
+    <string name="volume_boost_notify_disabled">Volume boost is now OFF"</string>
+    <string name="volume_boost_notify_unavailable">Extra volume is not available when using a headset</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d079b22..192402be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -617,14 +617,4 @@
     <string name="dialpad_star_letters"></string>
     <!--  Do not translate. -->
     <string name="dialpad_pound_letters"></string>
-
-    <!-- Set Subscription screen: label sub 1 -->
-    <string name="sub_1">SIM 1</string>
-    <!-- Set Subscription screen: label sub 2 -->
-    <string name="sub_2">SIM 2</string>
-
-    <string name="volume_boost_notify_enabled">"Volume boost ON."</string>
-    <string name="volume_boost_notify_disabled">"Volume boost OFF."</string>
-    <string name="volume_boost_notify_unavailable">"Extra volume is not available when Wired/Blue tooth headset is used."</string>
-    <string name="volume_boost_toast_position">180</string>
 </resources>
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index d2ae19c6..cfa73fa6 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -76,7 +76,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private Button mVBButton;
     private AudioManager mAudioManager;
     private Toast mVBNotify;
-    private int mVBToastPosition;
     private boolean mVBEnabled;
 
     // Secondary caller info
@@ -176,9 +175,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mVBToastPosition = Integer.parseInt(
-                getResources().getString(R.string.volume_boost_toast_position));
-
         mAudioManager = (AudioManager) getActivity()
                 .getSystemService(Context.AUDIO_SERVICE);
     }
@@ -860,7 +856,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
     private OnClickListener mVBListener = new OnClickListener() {
         @Override
-        public void onClick(View arg0) {
+        public void onClick(View view) {
             if (isVBAvailable()) {
                 switchVBStatus();
             }
@@ -889,14 +885,12 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     }
 
     private void updateVBButton() {
-        if (isVBAvailable()
-                && mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
-
+        if (isVBAvailable()) {
+            if (mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
                 mVBButton.setBackgroundResource(R.drawable.volume_in_boost_sel);
-        } else if (isVBAvailable()
-                && !(mAudioManager.getParameters(VOLUME_BOOST).contains("=on"))) {
-
+            } else {
                 mVBButton.setBackgroundResource(R.drawable.volume_in_boost_nor);
+            }
         } else {
             mVBButton.setBackgroundResource(R.drawable.volume_in_boost_unavailable);
         }
@@ -907,22 +901,19 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             mVBNotify.cancel();
         }
 
-        if (isVBAvailable()
-                && mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
-
-            mVBNotify = Toast.makeText(getView().getContext(),
-                    R.string.volume_boost_notify_enabled, Toast.LENGTH_SHORT);
-        } else if (isVBAvailable()
-                && !(mAudioManager.getParameters(VOLUME_BOOST).contains("=on"))) {
+        int textResId;
 
-            mVBNotify = Toast.makeText(getView().getContext(),
-                    R.string.volume_boost_notify_disabled, Toast.LENGTH_SHORT);
+        if (isVBAvailable()) {
+            if (mAudioManager.getParameters(VOLUME_BOOST).contains("=on")) {
+                textResId = R.string.volume_boost_notify_enabled;
+            } else {
+                textResId = R.string.volume_boost_notify_disabled;
+            }
         } else {
-            mVBNotify = Toast.makeText(getView().getContext(),
-                    R.string.volume_boost_notify_unavailable, Toast.LENGTH_SHORT);
+            textResId = R.string.volume_boost_notify_unavailable;
         }
 
-        mVBNotify.setGravity(Gravity.TOP, 0, mVBToastPosition);
+        mVBNotify = Toast.makeText(getActivity(), textResId, Toast.LENGTH_SHORT);
         mVBNotify.show();
     }