7 files changed, 23 insertions, 1 deletions

diff --git a/res/drawable-hdpi/ic_more.png b/res/drawable-hdpi/ic_more.png
new file mode 100644
index 00000000..ac44e1db
--- /dev/null
+++ b/res/drawable-hdpi/ic_more.png
diff --git a/res/drawable-mdpi/ic_more.png b/res/drawable-mdpi/ic_more.png
new file mode 100644
index 00000000..092a8786
--- /dev/null
+++ b/res/drawable-mdpi/ic_more.png
diff --git a/res/drawable-xhdpi/ic_more.png b/res/drawable-xhdpi/ic_more.png
new file mode 100644
index 00000000..d9132037
--- /dev/null
+++ b/res/drawable-xhdpi/ic_more.png
diff --git a/res/drawable-xxhdpi/ic_more.png b/res/drawable-xxhdpi/ic_more.png
new file mode 100644
index 00000000..1570e4f9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_more.png
diff --git a/res/values/qticonfig.xml b/res/values/qticonfig.xml
index 2ed5e3d8..6013093b 100644
--- a/res/values/qticonfig.xml
+++ b/res/values/qticonfig.xml
@@ -29,4 +29,8 @@
 <resources>
     <!-- Determines UI extensions for video calls should be used. -->
     <bool name="video_call_use_ext">true</bool>
+    <!-- Label for "More" notification action. This is a displayed on the notification for an
+        incoming call, and brings the phone application to foreground and displays multiple options
+        for accepting (or declining) the call. [CHAR LIMIT=12] -->
+    <string name="notification_action_answer_more">More</string>
 </resources>
diff --git a/src/com/android/incallui/NotificationBroadcastReceiver.java b/src/com/android/incallui/NotificationBroadcastReceiver.java
index 2543b783..d5e6ff4a 100644
--- a/src/com/android/incallui/NotificationBroadcastReceiver.java
+++ b/src/com/android/incallui/NotificationBroadcastReceiver.java
@@ -45,6 +45,8 @@ public class NotificationBroadcastReceiver extends BroadcastReceiver {
             "com.android.incallui.ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST";
     public static final String ACTION_DECLINE_VIDEO_UPGRADE_REQUEST =
             "com.android.incallui.ACTION_DECLINE_VIDEO_UPGRADE_REQUEST";
+    public static final String ACTION_ANSWER_MORE_INCOMING_CALL =
+            "com.android.incallui.ACTION_ANSWER_MORE_INCOMING_CALL";
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -68,6 +70,8 @@ public class NotificationBroadcastReceiver extends BroadcastReceiver {
                     VideoProfile.STATE_BIDIRECTIONAL, context);
         } else if (action.equals(ACTION_DECLINE_VIDEO_UPGRADE_REQUEST)) {
             InCallPresenter.getInstance().declineUpgradeRequest(context);
+        } else if (action.equals(ACTION_ANSWER_MORE_INCOMING_CALL)) {
+            InCallPresenter.getInstance().bringToForeground(false);
         }
     }
 
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 8df4520b..160c8ea4 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -294,7 +294,11 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
             addDismissAction(builder);
             if (call.isVideoCall(mContext)) {
                 addVoiceAction(builder);
-                addVideoCallAction(builder);
+                if (QtiCallUtils.useExt(mContext)) {
+                    addMoreAction(builder);
+                } else {
+                    addVideoCallAction(builder);
+                }
             } else {
                 addAnswerAction(builder);
             }
@@ -503,6 +507,16 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
                 answerVideoPendingIntent);
     }
 
+    private void addMoreAction(Notification.Builder builder) {
+        Log.i(this, "Will show \"more\" action in the incoming call Notification");
+
+        PendingIntent answerMorePendingIntent = createNotificationPendingIntent(
+                mContext, NotificationBroadcastReceiver.ACTION_ANSWER_MORE_INCOMING_CALL);
+        builder.addAction(R.drawable.ic_more,
+                mContext.getText(R.string.notification_action_answer_more),
+                answerMorePendingIntent);
+    }
+
     private void addVoiceAction(Notification.Builder builder) {
         Log.d(this, "Will show \"voice\" action in the incoming call Notification");