diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-29 01:04:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-29 01:04:55 +0000 |
commit | 1b3cf4d73e692182efc3a87e1582505438309283 (patch) | |
tree | b7b71bea6349e97306c9cecc200240c89a167eef /java/com/android/incallui | |
parent | d72585b40d67560cb868c2ac4d6fbda2ed27454b (diff) | |
parent | 57751c35a0d4f25a817378b0a4b1d14336a0d4e8 (diff) |
Merge changes Ib658efa6,I0f84f15c
* changes:
Create a common widget (ContactPhotoView) for a contact photo and its optional badge.
Remove unnecessary call to StatusBarNotifier.updateNotification().
Diffstat (limited to 'java/com/android/incallui')
-rw-r--r-- | java/com/android/incallui/InCallActivity.java | 3 | ||||
-rw-r--r-- | java/com/android/incallui/InCallPresenter.java | 17 |
2 files changed, 0 insertions, 20 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 8144ddb10..9d08dc4b6 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -476,7 +476,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity if (!InCallPresenter.getInstance().isReadyForTearDown()) { updateTaskDescription(); - InCallPresenter.getInstance().updateNotification(); } // If there is a pending request to show or hide the dialpad, handle that now. @@ -534,8 +533,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity dialpadFragment.onDialerKeyUp(null); } - InCallPresenter.getInstance().updateNotification(); - InCallPresenter.getInstance().getPseudoScreenState().removeListener(this); Trace.endSection(); } diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index a4b90f1a6..2e98a969d 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -1050,14 +1050,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud "updateIsChangingConfigurations = " + isChangingConfigurations); } - void updateNotification() { - // We need to update the notification bar when we leave the UI because that - // could trigger it to show again. - if (statusBarNotifier != null) { - statusBarNotifier.updateNotification(); - } - } - /** Called when the activity goes in/out of the foreground. */ public void onUiShowing(boolean showing) { if (proximitySensor != null) { @@ -1316,11 +1308,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud // know that start-up is complete. // // [ AND NOW YOU'RE IN THE CALL. voila! ] - // - // Our app is started using a fullScreen notification. We need to do this whenever - // we get an incoming call. Depending on the current context of the device, either a - // incoming call HUN or the actual InCallActivity will be shown. - final boolean startIncomingCallSequence = (InCallState.INCOMING == newState); // A dialog to show on top of the InCallUI to select a PhoneAccount final boolean showAccountPicker = (InCallState.WAITING_FOR_ACCOUNT == newState); @@ -1387,10 +1374,6 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud if (showCallUi || showAccountPicker) { LogUtil.i("InCallPresenter.startOrFinishUi", "Start in call UI"); showInCall(false /* showDialpad */, !showAccountPicker /* newOutgoingCall */); - } else if (startIncomingCallSequence) { - LogUtil.i("InCallPresenter.startOrFinishUi", "Start Full Screen in call UI"); - - statusBarNotifier.updateNotification(); } else if (newState == InCallState.NO_CALLS) { // The new state is the no calls state. Tear everything down. attemptFinishActivity(); |