Revert "[1/2] InCall: Add a non-intrusive dialog"

Author: codex-corp

res/drawable/incoming_call_card.xml

@@ -119,10 +119,6 @@
     <dimen name="glowpadview_margin_bottom">-48dip</dimen>
     <dimen name="glowpadview_margin_right">0dip</dimen>
 
-
-    <!-- Height of the in-call card -->
-    <dimen name="incoming_call_card_height">112dip</dimen>
-
     <!-- Dimensions for Video Call Panel -->
     <dimen name="indicator_bar_width">38dp</dimen>
 

res/layout/card_call_incoming.xml

@@ -28,7 +28,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.view.IWindowManager;
@@ -64,7 +63,6 @@ public class InCallPresenter implements CallList.Listener {
     private Context mContext;
     private CallList mCallList;
     private InCallActivity mInCallActivity;
-    private InCallCardActivity mInCallCardActivity;
     private InCallState mInCallState = InCallState.NO_CALLS;
     private AccelerometerListener mAccelerometerListener;
     private ProximitySensor mProximitySensor;
@@ -179,12 +177,6 @@ public void tearDown() {
     }
 
     private void attemptFinishActivity() {
-        // Finish our presenter card in all cases, we won't need it anymore whatever might
-        // happen.
-        if (mInCallCardActivity != null) {
-            mInCallCardActivity.finish();
-        }
-
         final boolean doFinish = (mInCallActivity != null && isActivityStarted());
         Log.i(this, "Hide in call UI: " + doFinish);
 
@@ -198,10 +190,6 @@ private void attemptFinishActivity() {
         }
     }
 
-    public void setCardActivity(InCallCardActivity inCallCardActivity) {
-        mInCallCardActivity = inCallCardActivity;
-    }
-
     /**
      * Sends modify call request to the other party.
      *
@@ -833,21 +821,13 @@ private void startUi(InCallState inCallState) {
             mCallUiInBackground = pm.isScreenOn() && !isKeyguardShowing;
         }
 
-        final PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
-        // If the screen is on, we'll prefer to not interrupt the user too much and slide in a card
-        if (pm.isScreenOn()) {
-            Intent intent = new Intent(mContext, InCallCardActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mContext.startActivity(intent);
-        } else {
-            mStatusBarNotifier.updateNotificationAndLaunchIncomingCallUi(inCallState, mCallList, mCallUiInBackground);
-        }
+        mStatusBarNotifier.updateNotificationAndLaunchIncomingCallUi(inCallState, mCallList, mCallUiInBackground);
     }
 
     /**
-  * Starts the incoming call Ui immediately used by the incoming call
-     * notification sent from framework's notification mechanism
-     */
+    * Starts the incoming call Ui immediately used by the incoming call
+    * notification sent from framework's notification mechanism
+    */
     public void startIncomingCallUi() {
         // Update the notification and UI this time with fullscreen intent
         // First cancel the actual notification and then update
@@ -856,13 +836,6 @@ public void startIncomingCallUi() {
                 InCallState.INCALL, mCallList, false);
     }
 
-    /**
-     * Starts the incoming call Ui immediately, bypassing the card UI
-     */
-    public void startIncomingCallUi(InCallState inCallState) {
-        mStatusBarNotifier.updateNotificationAndLaunchIncomingCallUi(inCallState, mCallList, mCallUiInBackground);
-    }
-
     /**
      * Checks to see if both the UI is gone and the service is disconnected. If so, tear it all
      * down.