Show InCallScreen when swiping phone affordance while in a call

Bug: 16344259

Change-Id: Ifd7975295d9c98af302b5ce769076152acf59939

1 files changed, 15 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index b8ac3e781950..3e2a398facaf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -25,9 +25,12 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
+import android.os.AsyncTask;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.phone.PhoneManager;
 import android.provider.MediaStore;
+import android.telecomm.TelecommManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -246,7 +249,18 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
     }
 
     public void launchPhone() {
-        mActivityStarter.startActivity(PHONE_INTENT, false /* dismissShade */);
+        TelecommManager tm = TelecommManager.from(mContext);
+        if (tm.isInAPhoneCall()) {
+            final PhoneManager pm = (PhoneManager) mContext.getSystemService(Context.PHONE_SERVICE);
+            AsyncTask.execute(new Runnable() {
+                @Override
+                public void run() {
+                    pm.showCallScreen(false /* showDialpad */);
+                }
+            });
+        } else {
+            mActivityStarter.startActivity(PHONE_INTENT, false /* dismissShade */);
+        }
     }