commit | d2fbc7479396a2e84b877ff48ec5d0e4eb69e163 | [log] [tgz] |
---|---|---|
author | Andrew Lee <anwlee@google.com> | Fri Aug 22 18:14:55 2014 -0700 |
committer | Andrew Lee <anwlee@google.com> | Mon Aug 25 10:17:47 2014 -0700 |
tree | 51c46df7dad1a3378c93fad9616cf2e18cc8a7d4 | |
parent | 5ef89ed01f89a78c28b09b4d4a218c6a47a9d03e [diff] |
Swap in new icon for "held" call in InCallUi. Not directly related to bug, but cleanup I noticed along the way. Bug: 15862303 Change-Id: I332597af836c073c4e6ae5f037cc033adf22e518
diff --git a/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png new file mode 100644 index 0000000..a2177f5 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png deleted file mode 100644 index 7e7bc3e..0000000 --- a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png +++ /dev/null Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png deleted file mode 100644 index 2cbcb5f..0000000 --- a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png +++ /dev/null Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png new file mode 100644 index 0000000..7dc920b --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png deleted file mode 100644 index 20ff4b6..0000000 --- a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png +++ /dev/null Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png new file mode 100644 index 0000000..a8becf4 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png deleted file mode 100644 index a6748d8..0000000 --- a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png +++ /dev/null Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png new file mode 100644 index 0000000..baf0cf2 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png deleted file mode 100644 index 6403ce8..0000000 --- a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png +++ /dev/null Binary files differ
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 35f266d..637ac16 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -436,7 +436,7 @@ // from the foreground call. And if there's a ringing call, // display that regardless of the state of the other calls. if (call.getState() == Call.State.ONHOLD) { - return R.drawable.stat_sys_phone_call_on_hold; + return R.drawable.ic_phone_paused_white_24dp; } else if (call.getSessionModificationState() == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { return R.drawable.ic_videocam;