diff options
| author | Nancy Chen <nancychen@google.com> | 2014-10-24 16:00:55 -0700 |
|---|---|---|
| committer | Nancy Chen <nancychen@google.com> | 2014-10-29 22:42:49 +0000 |
| commit | 991acb8d1b00d68e2be118cae5e9396d1127d5bb (patch) | |
| tree | 831436338bb29e872f0d7eaf66024f411aa53f35 /InCallUI/res/drawable/btn_merge.xml | |
| parent | e05642ba64551c6fc96dee79e65d223f9326a749 (diff) | |
In Multi-SIM cases use the color of the SIM icon for InCallUI.
Set the color of the InCallUI to be the color of the SIM icon. In the
single SIM case, the background should be the default background.
* Added id to all call button backgrounds for color change
* Initialize color onResume for InCallActivity
* CallCardFragment/CallButtonFragment/DialpadFragment update their colors
* Added InCallUIMaterialColorMapUtils to extract color
Bug: 17971273
Change-Id: Ia247b153b57ffc8a5277d521c433ab0be6696cf6
Diffstat (limited to 'InCallUI/res/drawable/btn_merge.xml')
| -rw-r--r-- | InCallUI/res/drawable/btn_merge.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/res/drawable/btn_merge.xml b/InCallUI/res/drawable/btn_merge.xml index 78e19749f..2b4818a47 100644 --- a/InCallUI/res/drawable/btn_merge.xml +++ b/InCallUI/res/drawable/btn_merge.xml @@ -18,7 +18,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_toolbar_merge" |