Promotion of atel.lnx.2.0-00010.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
959132 I43495693906833838f2e0fdf9c328f40708aca12 IMS-VT: Handle buttons display in InCall Screen
1061431 Id8591dab55243d337f746a782cd954b56f4fe953 Dialer:CallLogActivity re-created when rotating device
1061081 Ic7d31a488bfa7bc53a436003e46c5305c730e0c1 IMS-VT: Set notificationType for IncomingCall when InCal
1054725 I30ae9701ce4de8c33dfec205942b59ec8465cebc Revert "Make FloatingActionButtonController view visible
Change-Id: I49d71c01b36849ddb6c522758b0b6e9fc07e9c6d
CRs-Fixed: 1061081, 1054725, 959132, 1061431
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4930315..715722b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -169,6 +169,7 @@
</activity>
<activity android:name="com.android.dialer.calllog.CallLogActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden"
android:label="@string/call_log_activity_title"
android:theme="@style/DialtactsThemeWithoutActionBarOverlay"
android:icon="@mipmap/ic_launcher_phone">
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index db597b2..5c1319f 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -36,6 +36,7 @@
import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_RXTX_VIDEO_CALL;
import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_RX_VIDEO_CALL;
import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_VO_VIDEO_CALL;
+import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_ADD_PARTICIPANT;
import android.content.Context;
import android.content.res.ColorStateList;
@@ -95,8 +96,8 @@
public static final int BUTTON_HOLD = 3;
public static final int BUTTON_SWAP = 4;
public static final int BUTTON_UPGRADE_TO_VIDEO = 5;
- public static final int BUTTON_SWITCH_CAMERA = 6;
- public static final int BUTTON_DOWNGRADE_TO_AUDIO = 7;
+ public static final int BUTTON_DOWNGRADE_TO_AUDIO = 6;
+ public static final int BUTTON_SWITCH_CAMERA = 7;
public static final int BUTTON_ADD_CALL = 8;
public static final int BUTTON_MERGE = 9;
public static final int BUTTON_PAUSE_VIDEO = 10;
@@ -108,7 +109,8 @@
public static final int BUTTON_RXTX_VIDEO_CALL = 16;
public static final int BUTTON_RX_VIDEO_CALL = 17;
public static final int BUTTON_VO_VIDEO_CALL = 18;
- public static final int BUTTON_COUNT = 19;
+ public static final int BUTTON_ADD_PARTICIPANT = 19;
+ public static final int BUTTON_COUNT = 20;
}
private SparseIntArray mButtonVisibilityMap = new SparseIntArray(BUTTON_COUNT);
@@ -492,6 +494,8 @@
return mSwitchCameraButton;
} else if (id == BUTTON_ADD_CALL) {
return mAddCallButton;
+ } else if (id == BUTTON_ADD_PARTICIPANT) {
+ return mAddParticipantButton;
} else if (id == BUTTON_MERGE) {
return mMergeButton;
} else if (id == BUTTON_PAUSE_VIDEO) {
@@ -538,10 +542,6 @@
mPauseVideoButton.setSelected(isPaused);
}
- public void enableAddParticipant(boolean show) {
- mAddParticipantButton.setVisibility(show ? View.VISIBLE : View.GONE);
- }
-
@Override
public void setMute(boolean value) {
if (mMuteButton.isSelected() != value) {
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 7ea2f7f..4fbce2a 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -34,6 +34,7 @@
import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_RXTX_VIDEO_CALL;
import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_RX_VIDEO_CALL;
import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_VO_VIDEO_CALL;
+import static com.android.incallui.CallButtonFragment.Buttons.BUTTON_ADD_PARTICIPANT;
import android.content.Context;
import android.os.Build;
@@ -526,9 +527,9 @@
ui.showButton(BUTTON_PAUSE_VIDEO, isVideo && !useExt);
ui.showButton(BUTTON_DIALPAD, true);
ui.showButton(BUTTON_MERGE, showMerge);
- ui.enableAddParticipant(showAddParticipant && !mEnhanceEnable);
-
+ ui.showButton(BUTTON_ADD_PARTICIPANT, showAddParticipant && !mEnhanceEnable);
ui.showButton(BUTTON_RECORD, showRecord);
+
/* Depending on the transfer capabilities, display the corresponding buttons */
if ((callTransferCapabilities & QtiImsExtUtils.QTI_IMS_CONSULTATIVE_TRANSFER) != 0) {
ui.showButton(BUTTON_TRANSFER_BLIND, true);
@@ -609,7 +610,6 @@
void setHold(boolean on);
void setCameraSwitched(boolean isBackFacingCamera);
void setVideoPaused(boolean isPaused);
- void enableAddParticipant(boolean show);
void setAudio(int mode);
void setSupportedAudio(int mask);
void displayDialpad(boolean on, boolean animate);
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 8c09ff3..d088594 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -339,9 +339,12 @@
final boolean isVideoUpgradeRequest = call.getSessionModificationState()
== Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
+ final Call pendingAccountSelectionCall = CallList.getInstance()
+ .getWaitingForAccountCall();
final int notificationType;
- if (callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING
- || isVideoUpgradeRequest) {
+ if ((callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING
+ || isVideoUpgradeRequest) && (!InCallPresenter.getInstance().isShowingInCallUi()
+ || pendingAccountSelectionCall != null)) {
notificationType = NOTIFICATION_INCOMING_CALL;
} else {
notificationType = NOTIFICATION_IN_CALL;
@@ -388,8 +391,6 @@
// Set up the main intent to send the user to the in-call screen
final PendingIntent inCallPendingIntent = createLaunchPendingIntent();
builder.setContentIntent(inCallPendingIntent);
- final Call pendingAccountSelectionCall = CallList.getInstance()
- .getWaitingForAccountCall();
// Set the intent as a full screen intent as well if a call is incoming
if (notificationType == NOTIFICATION_INCOMING_CALL
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index d5f0035..98986c5 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1511,8 +1511,6 @@
mFloatingActionButtonController.setVisible(true);
mDialpadChooser.setVisibility(View.GONE);
}
-
- onHiddenChanged(false);
}
/**