diff options
| -rw-r--r-- | assets/quantum/res/drawable/quantum_ic_phone_locked_vd_theme_24.xml | 10 | ||||
| -rw-r--r-- | assets/quantum/res/drawable/quantum_ic_phone_paused_vd_theme_24.xml | 10 | ||||
| -rw-r--r-- | java/com/android/incallui/StatusBarNotifier.java | 7 | ||||
| -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, 25 insertions, 2 deletions
diff --git a/assets/quantum/res/drawable/quantum_ic_phone_locked_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_phone_locked_vd_theme_24.xml new file mode 100644 index 000000000..a249774b2 --- /dev/null +++ b/assets/quantum/res/drawable/quantum_ic_phone_locked_vd_theme_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM20,4v-0.5C20,2.12 18.88,1 17.5,1S15,2.12 15,3.5L15,4c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1L21,5c0,-0.55 -0.45,-1 -1,-1zM19.2,4h-3.4v-0.5c0,-0.94 0.76,-1.7 1.7,-1.7s1.7,0.76 1.7,1.7L19.2,4z"/> +</vector> diff --git a/assets/quantum/res/drawable/quantum_ic_phone_paused_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_phone_paused_vd_theme_24.xml new file mode 100644 index 000000000..99d25c10d --- /dev/null +++ b/assets/quantum/res/drawable/quantum_ic_phone_paused_vd_theme_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M17,3h-2v7h2L17,3zM20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM19,3v7h2L21,3h-2z"/> +</vector> 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/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 |
