diff options
Diffstat (limited to 'java/com/android/incallui')
-rw-r--r-- | java/com/android/incallui/InCallActivity.java | 10 | ||||
-rw-r--r-- | java/com/android/incallui/StatusBarNotifier.java | 7 | ||||
-rw-r--r-- | java/com/android/incallui/call/CallList.java | 13 | ||||
-rw-r--r-- | java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png | bin | 458 -> 0 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-mdpi/ic_phone_paused_white_24dp.png | bin | 346 -> 0 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-xhdpi/ic_phone_paused_white_24dp.png | bin | 584 -> 0 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png | bin | 842 -> 0 bytes |
7 files changed, 28 insertions, 2 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index c3a68c021..c509e4890 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -40,6 +40,8 @@ import com.android.dialer.compat.ActivityCompat; import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; +import com.android.dialer.logging.LoggingBindings; +import com.android.dialer.logging.LoggingBindingsFactory; import com.android.dialer.logging.ScreenEvent; import com.android.incallui.answer.bindings.AnswerBindings; import com.android.incallui.answer.protocol.AnswerScreen; @@ -145,6 +147,14 @@ public class InCallActivity extends TransactionSafeFragmentActivity pseudoBlackScreenOverlay = findViewById(R.id.psuedo_black_screen_overlay); sendBroadcast(CallPendingActivity.getFinishBroadcast()); Trace.endSection(); + if (getApplicationContext() instanceof LoggingBindingsFactory) { + LoggingBindings loggingBindings = + ((LoggingBindingsFactory) getApplicationContext()).newLoggingBindings(); + loggingBindings.logStopLatencyTimer( + LoggingBindings.ON_CALL_ADDED_TO_ON_INCALL_UI_SHOWN_INCOMING); + loggingBindings.logStopLatencyTimer( + LoggingBindings.ON_CALL_ADDED_TO_ON_INCALL_UI_SHOWN_OUTGOING); + } } @Override diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index 4ce43935e..bb3ef4333 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -624,7 +624,8 @@ public class StatusBarNotifier * Returns the appropriate icon res Id to display based on the call for which we want to display * information. */ - private int getIconToDisplay(DialerCall call) { + @VisibleForTesting + public int getIconToDisplay(DialerCall call) { // Even if both lines are in use, we only show a single item in // the expanded Notifications UI. It's labeled "Ongoing call" // (or "On hold" if there's only one call, and it's on hold.) @@ -633,7 +634,7 @@ public class StatusBarNotifier // from the foreground call. And if there's a ringing call, // display that regardless of the state of the other calls. if (call.getState() == DialerCall.State.ONHOLD) { - return R.drawable.ic_phone_paused_white_24dp; + return R.drawable.quantum_ic_phone_paused_vd_theme_24; } else if (call.getVideoTech().getSessionModificationState() == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST || call.isVideoCall()) { @@ -644,6 +645,8 @@ public class StatusBarNotifier // helpful hint for users so they know how to get back to the call. For Sprint HD calls, we // replace this icon with an icon of a phone with a HD badge. This is a carrier requirement. return R.drawable.ic_hd_call; + } else if (call.hasProperty(Details.PROPERTY_HAS_CDMA_VOICE_PRIVACY)) { + return R.drawable.quantum_ic_phone_locked_vd_theme_24; } // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble. if (ReturnToCallController.isEnabled(mContext) diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 59f38349a..4f1dfd43f 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -36,6 +36,8 @@ import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; +import com.android.dialer.logging.LoggingBindings; +import com.android.dialer.logging.LoggingBindingsFactory; import com.android.dialer.shortcuts.ShortcutUsageReporter; import com.android.dialer.spam.Spam; import com.android.dialer.spam.SpamBindings; @@ -117,6 +119,17 @@ public class CallList implements DialerCallDelegate { public void onCallAdded( final Context context, final android.telecom.Call telecomCall, LatencyReport latencyReport) { Trace.beginSection("CallList.onCallAdded"); + if (context.getApplicationContext() instanceof LoggingBindingsFactory) { + if (telecomCall.getState() == Call.STATE_CONNECTING) { + ((LoggingBindingsFactory) context.getApplicationContext()) + .newLoggingBindings() + .logStartLatencyTimer(LoggingBindings.ON_CALL_ADDED_TO_ON_INCALL_UI_SHOWN_OUTGOING); + } else if (telecomCall.getState() == Call.STATE_RINGING) { + ((LoggingBindingsFactory) context.getApplicationContext()) + .newLoggingBindings() + .logStartLatencyTimer(LoggingBindings.ON_CALL_ADDED_TO_ON_INCALL_UI_SHOWN_INCOMING); + } + } if (mUiListeners != null) { mUiListeners.onCallAdded(); } diff --git a/java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png b/java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png Binary files differdeleted file mode 100644 index a2177f58a..000000000 --- a/java/com/android/incallui/res/drawable-hdpi/ic_phone_paused_white_24dp.png +++ /dev/null diff --git a/java/com/android/incallui/res/drawable-mdpi/ic_phone_paused_white_24dp.png b/java/com/android/incallui/res/drawable-mdpi/ic_phone_paused_white_24dp.png Binary files differdeleted file mode 100644 index 7dc920b2b..000000000 --- a/java/com/android/incallui/res/drawable-mdpi/ic_phone_paused_white_24dp.png +++ /dev/null diff --git a/java/com/android/incallui/res/drawable-xhdpi/ic_phone_paused_white_24dp.png b/java/com/android/incallui/res/drawable-xhdpi/ic_phone_paused_white_24dp.png Binary files differdeleted file mode 100644 index a8becf485..000000000 --- a/java/com/android/incallui/res/drawable-xhdpi/ic_phone_paused_white_24dp.png +++ /dev/null diff --git a/java/com/android/incallui/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png b/java/com/android/incallui/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png Binary files differdeleted file mode 100644 index baf0cf27f..000000000 --- a/java/com/android/incallui/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png +++ /dev/null |