From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 6 Apr 2017 09:41:50 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
---
 java/com/android/dialer/shortcuts/CallContactActivity.java | 14 ++++++++------
 java/com/android/dialer/shortcuts/res/values/themes.xml    |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'java/com/android/dialer/shortcuts')

diff --git a/java/com/android/dialer/shortcuts/CallContactActivity.java b/java/com/android/dialer/shortcuts/CallContactActivity.java
index 40bf97b87..d2c9a760d 100644
--- a/java/com/android/dialer/shortcuts/CallContactActivity.java
+++ b/java/com/android/dialer/shortcuts/CallContactActivity.java
@@ -56,6 +56,12 @@ public class CallContactActivity extends TransactionSafeActivity
     }
   }
 
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    LogUtil.enterBlock("CallContactActivity.onDestroy");
+  }
+
   /**
    * Attempt to make a call, finishing the activity if the required permissions are already granted.
    * If the required permissions are not already granted, the activity is not finished so that the
@@ -64,12 +70,8 @@ public class CallContactActivity extends TransactionSafeActivity
   private void makeCall() {
     CallSpecificAppData callSpecificAppData = new CallSpecificAppData();
     callSpecificAppData.callInitiationType = CallInitiationType.Type.LAUNCHER_SHORTCUT;
-    boolean interactionStarted =
-        PhoneNumberInteraction.startInteractionForPhoneCall(
-            this, contactUri, false /* isVideoCall */, callSpecificAppData);
-    if (interactionStarted) {
-      finish();
-    }
+    PhoneNumberInteraction.startInteractionForPhoneCall(
+        this, contactUri, false /* isVideoCall */, callSpecificAppData);
   }
 
   @Override
diff --git a/java/com/android/dialer/shortcuts/res/values/themes.xml b/java/com/android/dialer/shortcuts/res/values/themes.xml
index 085854d89..d38a09a51 100644
--- a/java/com/android/dialer/shortcuts/res/values/themes.xml
+++ b/java/com/android/dialer/shortcuts/res/values/themes.xml
@@ -26,7 +26,7 @@
   <style name="CallContactsTheme" parent="Theme.AppCompat.Light">
     <item name="android:windowNoTitle">true</item>
     <item name="android:backgroundDimEnabled">false</item>
-    <item name="android:windowBackground">@null</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:windowFrame">@null</item>
     <item name="android:windowContentOverlay">@null</item>
     <item name="android:windowAnimationStyle">@null</item>
-- 
cgit v1.2.3