InCallUI: Modify review comments in InCallUI

  Some modifications are cherry-pick from git hub
  we can not modify it,so modify the review comments
  in this commit.remove extra spaces and adjust indentation
  CRs-Fixed:770912

Change-Id: If869d33fc5e7df56edd9ecb3f0588ed529ec0257

4 files changed, 109 insertions, 87 deletions

diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index ec36b53d..66625cb4 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -31,6 +31,9 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
@@ -167,6 +170,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private InCallActivity mInCallActivity;
     // for RCS
     private RcsRichScreen mRcsRichScreen = null;
+    private boolean misEhanceScreenApkInstalled = false;
+    private static final String ENHANCE_SCREEN_APK_NAME = "com.cmdm.rcs";
     //RCS end
 
     private static final int DEFAULT_VIEW_OFFSET_Y = 0;
@@ -206,7 +211,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         getActivity().registerReceiver(recorderStateReceiver, filter);
 
         mInCallActivity = (InCallActivity)getActivity();
-
+        misEhanceScreenApkInstalled = isEnhanceScreenInstalled();
         if (mInCallActivity.isCallRecording()) {
             recorderHandler.sendEmptyMessage(MESSAGE_TIMER);
         }
@@ -1070,6 +1075,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         if (RcsApiManager.isRcsServiceInstalled()) {
             updateUnReadSmsCount();
         }
+        misEhanceScreenApkInstalled = isEnhanceScreenInstalled();
     }
 
     /**
@@ -1475,8 +1481,21 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     }
 
    // RCS support start
-    private boolean isRcsAvailable(){
-        return RcsApiManager.isRcsServiceInstalled() && RcsApiManager.isRcsOnline();
+    private boolean isRcsAvailable() {
+        return RcsApiManager.isRcsServiceInstalled()
+                && RcsApiManager.isRcsOnline() && misEhanceScreenApkInstalled;
+    }
+
+    private boolean isEnhanceScreenInstalled() {
+        boolean installed = false;
+        try {
+            ApplicationInfo info = getActivity().getPackageManager().getApplicationInfo(
+                ENHANCE_SCREEN_APK_NAME, PackageManager.GET_PROVIDERS);
+            installed = (info != null);
+        } catch (NameNotFoundException e) {
+        }
+        Log.i(this, "Is Enhance Screen installed ? " + installed);
+        return installed;
     }
 
     private BroadcastReceiver mSmsReceiver = new BroadcastReceiver() {
diff --git a/src/com/android/incallui/GifMovieView.java b/src/com/android/incallui/GifMovieView.java
index 2c2deb04..7ed49ba3 100644
--- a/src/com/android/incallui/GifMovieView.java
+++ b/src/com/android/incallui/GifMovieView.java
@@ -74,7 +74,8 @@ public class GifMovieView extends View {
             setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
 
-        final TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.GifMoviewView, defStyle,
+        final TypedArray array = context.obtainStyledAttributes(attrs,
+                R.styleable.GifMoviewView, defStyle,
                 R.style.Widget_GifMoviewView);
 
         mMovieResourceId = array.getResourceId(R.styleable.GifMoviewView_gif, -1);
@@ -91,16 +92,14 @@ public class GifMovieView extends View {
         this.mMovieString = path;
         Log.d(TAG,path);
         BufferedInputStream is = null;
-         try {
-             is = new BufferedInputStream(new FileInputStream(path));
-             Log.d(TAG,is.toString());
-         } catch (FileNotFoundException e) {
-             // TODO Auto-generated catch block
-             Log.d(TAG,"FileNotFoundException");
-             e.printStackTrace();
-         }
-         Log.d(TAG,is.toString());
-         mMovie = Movie.decodeStream(is);
+        try {
+            is = new BufferedInputStream(new FileInputStream(path));
+        } catch (FileNotFoundException e) {
+            Log.d(TAG,"FileNotFoundException");
+            e.printStackTrace();
+        }
+        Log.d(TAG,is.toString());
+        mMovie = Movie.decodeStream(is);
         requestLayout();
      }
 
diff --git a/src/com/android/incallui/RcsApiManager.java b/src/com/android/incallui/RcsApiManager.java
index a43c2eb5..64fdacd5 100644
--- a/src/com/android/incallui/RcsApiManager.java
+++ b/src/com/android/incallui/RcsApiManager.java
@@ -22,21 +22,21 @@
  */
 
 package com.android.incallui;
-import com.suntek.mway.rcs.client.api.RCSServiceListener;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Log;
 import com.suntek.mway.rcs.client.api.autoconfig.RcsAccountApi;
+import com.suntek.mway.rcs.client.api.capability.impl.CapabilityApi;
 import com.suntek.mway.rcs.client.api.impl.groupchat.ConfApi;
 import com.suntek.mway.rcs.client.api.support.RcsSupportApi;
+import com.suntek.mway.rcs.client.api.RCSServiceListener;
 import com.suntek.mway.rcs.client.api.util.ServiceDisconnectedException;
-import com.suntek.mway.rcs.client.api.capability.impl.CapabilityApi;
 import com.suntek.mway.rcs.client.api.voip.impl.RichScreenApi;
-import com.suntek.mway.rcs.client.api.plugin.entity.richscrn.RichScrnShowing;
-import android.content.Context;
-import android.os.RemoteException;
-import android.util.Log;
 
 public class RcsApiManager {
     private static boolean mIsRcsServiceInstalled;
-    private static String TAG = "Dialer RCS";
+    private static String TAG = "InCallUI_RcsApiManager";
     private static ConfApi mConfApi = new ConfApi();
     private static RcsAccountApi mRcsAccountApi = new RcsAccountApi();
     private static CapabilityApi mCapabilityApi = new CapabilityApi();
@@ -47,38 +47,38 @@ public class RcsApiManager {
         Log.d(TAG, "RCS init");
         mIsRcsServiceInstalled = RcsSupportApi.isRcsServiceInstalled(context);
         if (!mIsRcsServiceInstalled) {
-        Log.d("RCS_UI", "mIsRcsServiceInstalled" + mIsRcsServiceInstalled);
+            Log.d(TAG, "mIsRcsServiceInstalled" + mIsRcsServiceInstalled);
             return;
         }
 
         mRcsAccountApi.init(context, new RCSServiceListener() {
             @Override
             public void onServiceDisconnected() throws RemoteException {
-                Log.d("RCS_UI", "RcsAccountApi disconnected");
+                Log.d(TAG, "RcsAccountApi disconnected");
             }
 
             @Override
             public void onServiceConnected() throws RemoteException {
-                Log.d("RCS_UI", "RcsAccountApi connected");
+                Log.d(TAG, "RcsAccountApi connected");
             }
         });
 
         mConfApi.init(context, new RCSServiceListener() {
             public void onServiceDisconnected() throws RemoteException {
-                Log.d("RCS_UI", "ConfApi connected");
+                Log.d(TAG, "ConfApi connected");
             }
 
             public void onServiceConnected() throws RemoteException {
-                Log.d("RCS_UI", "ConfApi connected");
+                Log.d(TAG, "ConfApi connected");
             }
         });
         mRichScreenApi.init(context, new RCSServiceListener() {
             public void onServiceDisconnected() throws RemoteException {
-                Log.d("RCS_UI", "RichScreenApi connected");
+                Log.d(TAG, "RichScreenApi connected");
             }
 
             public void onServiceConnected() throws RemoteException {
-                Log.d("RCS_UI", "RichScreenApi connected");
+                Log.d(TAG, "RichScreenApi connected");
             }
         });
         mCapabilityApi.init(context, null);
diff --git a/src/com/android/incallui/RcsRichScreen.java b/src/com/android/incallui/RcsRichScreen.java
index 2c319f57..2afef43c 100644
--- a/src/com/android/incallui/RcsRichScreen.java
+++ b/src/com/android/incallui/RcsRichScreen.java
@@ -40,12 +40,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.telecom.VideoProfile;
 import com.android.incallui.RcsApiManager;
+import com.suntek.mway.rcs.client.aidl.plugin.entity.richscrn.ResultInfo;
+import com.suntek.mway.rcs.client.aidl.plugin.entity.richscrn.RichScrnShowing;
 import com.suntek.mway.rcs.client.api.util.ServiceDisconnectedException;
-import com.suntek.mway.rcs.client.api.plugin.entity.richscrn.RichScrnShowing;
 import com.suntek.mway.rcs.client.api.voip.impl.RichScreenApi;
 import com.suntek.mway.rcs.client.api.RCSServiceListener;
 import android.os.RemoteException;
-import com.suntek.mway.rcs.client.api.plugin.entity.richscrn.ResultInfo;
 
 public class RcsRichScreen {
     private static String TAG = "RCS_UI_RcsRichScreen";
@@ -119,11 +119,6 @@ public class RcsRichScreen {
         initSurfaceView();
     }
 
-    // RCS support start
-    private boolean isRcsAvailable() {
-         return RcsApiManager.isRcsServiceInstalled()&&RcsApiManager.isRcsOnline();
-    }
-
     private void initSurfaceView() {
         surfaceholder = msurface.getHolder();
         surfaceholder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
@@ -213,7 +208,7 @@ public class RcsRichScreen {
         getResultUtilInfo(result);
     }
 
-    private void getResultUtilInfo(RichScrnShowing result) {
+    private void getResultUtilInfo(final RichScrnShowing result) {
         if (result == null) {
             Log.i(TAG, "getResultUtilInfo retult is null");
             setRcsFragmentVisibleDefault();
@@ -227,58 +222,65 @@ public class RcsRichScreen {
         msurface.setVisibility(View.GONE);
         mGifMovieView.setVisibility(View.GONE);
         missdnAddress.setVisibility(View.GONE);
-        if (null != result.getGreeting()
-                && !TextUtils.isEmpty(result.getGreeting())) {
-            mGreeting.setVisibility(View.VISIBLE);
-            StringBuilder greetingString = new StringBuilder();
-            greetingString.append(mContext.getResources().getString(
-                    R.string.rcs_greeting_string));
-            greetingString.append(result.getGreeting());
-            mGreeting.setText(greetingString.toString());
-        }
-        if (null != result.getMissdnAddress()
-                && !TextUtils.isEmpty(result.getMissdnAddress())) {
-            missdnAddress.setVisibility(View.VISIBLE);
-            StringBuilder missdnAddressString = new StringBuilder();
-            missdnAddressString.append(mContext.getResources().getString(
-                    R.string.rcs_missdnaddress_string));
-            missdnAddressString.append(result.getMissdnAddress());
-            missdnAddress.setText(missdnAddressString.toString());
-        } else {
-            missdnAddress.setVisibility(View.GONE);
-            try {
-                Log.i(TAG, "getRichScreenApi.DownloadHomeLocRules"
-                        + RcsApiManager.getRichScreenApi());
-                RcsApiManager.getRichScreenApi().downloadHomeLocRules(
-                        mPhoneEevnt);
-            } catch (Exception e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+        new Thread() {
+             @Override
+             public void run() {
+                if (null != result.getGreeting()
+                        && !TextUtils.isEmpty(result.getGreeting())) {
+                    mGreeting.setVisibility(View.VISIBLE);
+                    StringBuilder greetingString = new StringBuilder();
+                    greetingString.append(mContext.getResources().getString(
+                            R.string.rcs_greeting_string));
+                    greetingString.append(result.getGreeting());
+                    mGreeting.setText(greetingString.toString());
+                }
+                if (null != result.getMissdnAddress()
+                        && !TextUtils.isEmpty(result.getMissdnAddress())) {
+                    missdnAddress.setVisibility(View.VISIBLE);
+                    StringBuilder missdnAddressString = new StringBuilder();
+                    missdnAddressString.append(mContext.getResources().getString(
+                            R.string.rcs_missdnaddress_string));
+                    missdnAddressString.append(result.getMissdnAddress());
+                    missdnAddress.setText(missdnAddressString.toString());
+                } else {
+                    missdnAddress.setVisibility(View.GONE);
+                    try {
+                        Log.i(TAG, "getRichScreenApi.DownloadHomeLocRules"
+                                + RcsApiManager.getRichScreenApi());
+                        RcsApiManager.getRichScreenApi().downloadHomeLocRules(
+                                mPhoneEevnt);
+                    } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+                String sorceType = result.getSourceType();
+                switch (Integer.valueOf(sorceType)) {
+                case RCS_STATIC_IMAGE: {
+
+                        mRcsPhoto.setVisibility(View.VISIBLE);
+                        Bitmap bitmap = BitmapFactory
+                                .decodeFile(result.getLocalSourceUrl());
+                        mRcsPhoto.setImageBitmap(bitmap);
+
+                }
+                break;
+                case RCS_VIRTUAL_IMAGE: {
+                    mGifMovieView.setVisibility(View.VISIBLE);
+                    mGifMovieView.setMovieResource(result.getLocalSourceUrl());
+                }
+                break;
+                case RCS_VIDEO: {
+                    msurface.setVisibility(View.VISIBLE);
+                    videoPath = result.getLocalSourceUrl();
+                }
+                break;
+                default:
+                    mRcsPhoto.setVisibility(View.VISIBLE);
+                break;
+                }
             }
-        }
-        String sorceType = result.getSourceType();
-        switch (Integer.valueOf(sorceType)) {
-        case RCS_STATIC_IMAGE: {
-            mRcsPhoto.setVisibility(View.VISIBLE);
-            Bitmap bitmap = BitmapFactory
-                    .decodeFile(result.getLocalSourceUrl());
-            mRcsPhoto.setImageBitmap(bitmap);
-        }
-            break;
-        case RCS_VIRTUAL_IMAGE: {
-            mGifMovieView.setVisibility(View.VISIBLE);
-            mGifMovieView.setMovieResource(result.getLocalSourceUrl());
-        }
-            break;
-        case RCS_VIDEO: {
-            msurface.setVisibility(View.VISIBLE);
-            videoPath = result.getLocalSourceUrl();
-        }
-            break;
-        default:
-            mRcsPhoto.setVisibility(View.VISIBLE);
-            break;
-        }
+        }.start();
     }
 
     public String getPhoneEventForRichScreen(int state, int videoState) {
@@ -343,6 +345,7 @@ public class RcsRichScreen {
         mRcsPhoto.setVisibility(View.GONE);
         msurface.setVisibility(View.GONE);
         mGifMovieView.setVisibility(View.GONE);
+        missdnAddress.setVisibility(View.GONE);
 
     }
 
@@ -352,6 +355,7 @@ public class RcsRichScreen {
         mRcsPhoto.setVisibility(View.VISIBLE);
         msurface.setVisibility(View.GONE);
         mGifMovieView.setVisibility(View.GONE);
+        missdnAddress.setVisibility(View.GONE);
 
     }