diff options
| author | Christine Chen <christinech@google.com> | 2013-09-13 22:00:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-13 22:00:50 +0000 |
| commit | 7663bf53ad140160693bb4b1907b24615d71678a (patch) | |
| tree | e10f25cc57d3aad32d57ca45b6e027111f6ec340 | |
| parent | f0d809e62337d4f316e31e79031996863b7eeac0 (diff) | |
| parent | ea31bb88727e214280639ea52a4fb8bcff52c622 (diff) | |
Merge "Changes how end call button looks" into klp-dev
14 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_dial_end_call.png b/InCallUI/res/drawable-hdpi/ic_dial_end_call.png Binary files differdeleted file mode 100644 index ab3adb443..000000000 --- a/InCallUI/res/drawable-hdpi/ic_dial_end_call.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.png Binary files differdeleted file mode 100644 index 0f373bb26..000000000 --- a/InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png Binary files differnew file mode 100644 index 000000000..d6f26f22c --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png diff --git a/InCallUI/res/drawable-mdpi/ic_dial_end_call.png b/InCallUI/res/drawable-mdpi/ic_dial_end_call.png Binary files differdeleted file mode 100644 index c47664226..000000000 --- a/InCallUI/res/drawable-mdpi/ic_dial_end_call.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.png Binary files differdeleted file mode 100644 index e090cc806..000000000 --- a/InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.png Binary files differnew file mode 100644 index 000000000..1dfad3b8f --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.png diff --git a/InCallUI/res/drawable-xhdpi/ic_dial_end_call.png b/InCallUI/res/drawable-xhdpi/ic_dial_end_call.png Binary files differdeleted file mode 100644 index c24ec9872..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_dial_end_call.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.png Binary files differdeleted file mode 100644 index f64f5e3d9..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.png Binary files differnew file mode 100644 index 000000000..1d1bfebfe --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png b/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png Binary files differdeleted file mode 100644 index 5b350225d..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png Binary files differdeleted file mode 100644 index da3b0750b..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.png Binary files differnew file mode 100644 index 000000000..67d8ad261 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.png diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 2174a9700..06de6d9fa 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -51,7 +51,7 @@ <ImageButton android:id="@+id/endButton" style="@style/InCallEndButton" android:layout_width="match_parent" - android:src="@drawable/ic_dial_end_call" + android:src="@drawable/ic_in_call_phone_hangup" android:background="@drawable/end_call_background" android:contentDescription="@string/onscreenEndCallText"/> diff --git a/InCallUI/res/layout/caller_in_conference.xml b/InCallUI/res/layout/caller_in_conference.xml index c2c68c836..924bc6305 100644 --- a/InCallUI/res/layout/caller_in_conference.xml +++ b/InCallUI/res/layout/caller_in_conference.xml @@ -99,7 +99,7 @@ android:id="@+id/conferenceCallerDisconnect" android:layout_width="80dp" android:layout_height="match_parent" - android:src="@drawable/ic_end_call_holo_dark" + android:src="@drawable/ic_in_call_phone_hangup" android:background="@drawable/end_call_background" android:scaleType="center" android:contentDescription="@string/onscreenEndCallText" /> |
