Merge "Swap in new icon for "held" call in InCallUi." into lmp-dev

10 files changed, 1 insertions, 1 deletions

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 000000000..a2177f58a
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_phone_paused_white_24dp.png
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 7e7bc3e6b..000000000
--- a/InCallUI/res/drawable-hdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
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 2cbcb5f60..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
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 000000000..7dc920b2b
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_phone_paused_white_24dp.png
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 20ff4b68f..000000000
--- a/InCallUI/res/drawable-mdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
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 000000000..a8becf485
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_phone_paused_white_24dp.png
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 a6748d893..000000000
--- a/InCallUI/res/drawable-xhdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
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 000000000..baf0cf27f
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_phone_paused_white_24dp.png
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 6403ce81d..000000000
--- a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png
+++ /dev/null
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 35f266d9e..637ac16ed 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -436,7 +436,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         // 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;