commit 446d2b12d299c71c46a915ee98b6c599aeb940f6
author Andrew Lee <anwlee@google.com> Fri May 01 18:27:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 01 18:27:27 2015 +0000
tree 9d9b180da8fc010413d9a144927127e255323870
parent e37ff67986416b8377295d44401ce2c62a0d9fe0
parent 59585f80dce30e53ea30f08f11089f6cdd6e41fb

Merge "Use new Call.Details.PROPERTY_* values." into mnc-dev

InCallUI/res/values/strings.xml

diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 332576d..c3ccc14 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -429,10 +429,6 @@
          [CHAR LIMIT=30] -->
     <string name="vibrate_on_ring_title">Vibrate when ringing</string>
 
-    <!--  Setting option name to enable or disable dialpad autocomplete functionality
-         [CHAR LIMIT=30] -->
-    <string name="dial_pad_autocomplete">Dialpad autocomplete</string>
-
     <!-- Title for the category "ringtone", which is shown above ringtone and vibration
          related settings.
          [CHAR LIMIT=30] -->

InCallUI/src/com/android/incallui/AnswerPresenter.java

diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 7e18012..04cc262 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -141,6 +141,9 @@
         final InCallActivity activity = InCallPresenter.getInstance().getActivity();
         if (activity != null) {
             activity.showAnswerFragment(show);
+            if (getUi() != null) {
+                getUi().onShowAnswerUi(show);
+            }
             return true;
         } else {
             return false;