IMS-VT: Move strings for video quality changed indication to resource files

Change-Id: Iee4d9152c6a2dcc8ce35776ceeaaf05966c1810e
CRs-Fixed: 761000

IMS-VT: Clean up the showCallSubstateChanged API

- Make the code more readable.

Change-Id: Ib7815cc57f74bbdd1fdfa830964713c781a87e9e
CRs-Fixed: 761000

2 files changed, 40 insertions, 17 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bb171f42..5e29cca8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -596,4 +596,14 @@
     <string name="call_substate_connected_suspended_video">Call Connected Suspended (Video)</string>
     <!-- Call substate label for avp retry -->
     <string name="call_substate_avp_retry">Avp Retry</string>
+    <!-- Video quality changed message -->
+    <string name="video_quality_changed">Video quality changed to \u0020</string>
+    <!-- Video quality High -->
+    <string name="video_quality_high">High</string>
+    <!-- Video quality Medium -->
+    <string name="video_quality_medium">Medium</string>
+    <!-- Video quality Low -->
+    <string name="video_quality_low">Low</string>
+    <!-- Video quality Unknown -->
+    <string name="video_quality_unknown">Unknown</string>
 </resources>
diff --git a/src/com/android/incallui/VideoCallFragment.java b/src/com/android/incallui/VideoCallFragment.java
index 3b839819..a618a37e 100644
--- a/src/com/android/incallui/VideoCallFragment.java
+++ b/src/com/android/incallui/VideoCallFragment.java
@@ -66,6 +66,11 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
      */
     public static final int ORIENTATION_UNKNOWN = -1;
 
+    /**
+     * Invalid resource id.
+     */
+    public static final int INVALID_RESOURCE_ID = -1;
+
 
     // Static storage used to retain the video surfaces across Activity restart.
     // TextureViews are not parcelable, so it is not possible to store them in the saved state.
@@ -561,25 +566,33 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
     public void showVideoQualityChanged(int videoQuality) {
         Log.d(this, "showVideoQualityChanged. Video quality changed to " + videoQuality);
 
-        String videoQualityChangedText = "Video quality changed to ";
+        final Context context = getActivity();
+        if (context == null) {
+            Log.e(this, "showVideoQualityChanged - Activity is null. Return");
+            return;
+        }
+
+        final Resources resources = context.getResources();
+
+        int videoQualityResourceId = R.string.video_quality_unknown;
         switch (videoQuality) {
             case VideoProfile.QUALITY_HIGH:
-                videoQualityChangedText += "High";
+                videoQualityResourceId = R.string.video_quality_high;
                 break;
             case VideoProfile.QUALITY_MEDIUM:
-                videoQualityChangedText += "Medium";
+                videoQualityResourceId = R.string.video_quality_medium;
                 break;
             case VideoProfile.QUALITY_LOW:
-                videoQualityChangedText += "Low";
+                videoQualityResourceId = R.string.video_quality_low;
                 break;
-            // Both unknown and default should display unknown. Intentional fall through.
-            case VideoProfile.QUALITY_UNKNOWN:
             default:
-                videoQualityChangedText += "Unknown";
                 break;
         }
 
-        Toast.makeText(getActivity(), videoQualityChangedText, Toast.LENGTH_SHORT).show();
+        String videoQualityChangedText = resources.getString(R.string.video_quality_changed) +
+            resources.getString(videoQualityResourceId);
+
+        Toast.makeText(context, videoQualityChangedText, Toast.LENGTH_SHORT).show();
     }
 
     /**
@@ -597,28 +610,28 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter,
         }
 
         final Resources resources = context.getResources();
-        String callSubstateChangedText = "";
 
+        int callSubstateResourceId = INVALID_RESOURCE_ID;
         switch (callSubstate) {
             case Connection.CALL_SUBSTATE_NONE:
-                callSubstateChangedText +=
-                    resources.getString(R.string.call_substate_call_resumed);
+                callSubstateResourceId = R.string.call_substate_call_resumed;
                 break;
             case Connection.CALL_SUBSTATE_AUDIO_CONNECTED_SUSPENDED:
-                callSubstateChangedText +=
-                    resources.getString(R.string.call_substate_connected_suspended_audio);
+                callSubstateResourceId = R.string.call_substate_connected_suspended_audio;
                 break;
             case Connection.CALL_SUBSTATE_VIDEO_CONNECTED_SUSPENDED:
-                callSubstateChangedText +=
-                    resources.getString(R.string.call_substate_connected_suspended_video);
+                callSubstateResourceId = R.string.call_substate_connected_suspended_video;
                 break;
             case Connection.CALL_SUBSTATE_AVP_RETRY:
-                callSubstateChangedText += resources.getString(R.string.call_substate_avp_retry);
+                callSubstateResourceId = R.string.call_substate_avp_retry;
                 break;
             default:
                 break;
         }
-        Toast.makeText(context, callSubstateChangedText, Toast.LENGTH_SHORT).show();
+        if (callSubstateResourceId != INVALID_RESOURCE_ID) {
+            Toast.makeText(context, resources.getString(callSubstateResourceId),
+                Toast.LENGTH_SHORT).show();
+        }
     }
 
     /**