diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-30 07:31:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-30 07:31:41 +0000 |
| commit | fb4a3213222d7c472e6f32df1a82adfbd2b0b39a (patch) | |
| tree | 978e817617700854b5e2ed6f166f883c3bf6ffe9 /java/com/android/incallui/StatusBarNotifier.java | |
| parent | a5338d2259c6d85a34e3b0fddb26f1ffeb73a56a (diff) | |
| parent | ff2ad7ffdba7c74077eae3016b32174f0f2dad30 (diff) | |
| download | android_packages_apps_Dialer-fb4a3213222d7c472e6f32df1a82adfbd2b0b39a.tar.gz android_packages_apps_Dialer-fb4a3213222d7c472e6f32df1a82adfbd2b0b39a.tar.bz2 android_packages_apps_Dialer-fb4a3213222d7c472e6f32df1a82adfbd2b0b39a.zip | |
release-request-c1e89bbc-a9dd-4c96-8532-caeb99fb86d6-for-git_oc-dr1-release-4229604 snap-temp-L39800000087367876
Change-Id: I0243bb362d0102b5bf1ca8a8ed978252b09e0055
Diffstat (limited to 'java/com/android/incallui/StatusBarNotifier.java')
| -rw-r--r-- | java/com/android/incallui/StatusBarNotifier.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 458df5149..53017a10e 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -66,6 +66,7 @@ import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.BitmapUtil; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.Session; import com.android.dialer.multimedia.MultimediaData; @@ -308,11 +309,19 @@ public class StatusBarNotifier if (callState == DialerCall.State.INCOMING || callState == DialerCall.State.CALL_WAITING || isVideoUpgradeRequest) { - boolean alreadyActive = - callList.getActiveOrBackgroundCall() != null - && InCallPresenter.getInstance().isShowingInCallUi(); - notificationType = - alreadyActive ? NOTIFICATION_INCOMING_CALL_QUIET : NOTIFICATION_INCOMING_CALL; + if (ConfigProviderBindings.get(mContext) + .getBoolean("quiet_incoming_call_if_ui_showing", true)) { + notificationType = + InCallPresenter.getInstance().isShowingInCallUi() + ? NOTIFICATION_INCOMING_CALL_QUIET + : NOTIFICATION_INCOMING_CALL; + } else { + boolean alreadyActive = + callList.getActiveOrBackgroundCall() != null + && InCallPresenter.getInstance().isShowingInCallUi(); + notificationType = + alreadyActive ? NOTIFICATION_INCOMING_CALL_QUIET : NOTIFICATION_INCOMING_CALL; + } } else { notificationType = NOTIFICATION_IN_CALL; } |