diff options
| author | Santos Cordon <santoscordon@google.com> | 2013-08-15 00:27:21 -0700 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2013-08-15 10:24:23 -0700 |
| commit | d28fc12696fa706fed70e04698275af7be7fee82 (patch) | |
| tree | 4405d8d9bb7d567c7193569bcf4cae159f6a7e0f /InCallUI/res/drawable-hdpi | |
| parent | 899251968ee4ee3cb375032185653ecd888e3f8d (diff) | |
Add logic support for manage conference screen. (Part 2 of 4)
Changes:
- Add conference call resource photo
- Move logic to determine the name/numbers to show in the Call card
from CallCardFragment to CallCardPresenter.
- CallCardPresenter now tells CallCardFragment if the primary call is
a conference call.
- Updated the primary/secondary call order do that Active Calls are
primary instead of Disconnected calls when both exist.
- Cleaned up some excessive logging.
- The CallCard code uses a whitelist to know which callcard to show.
The change in services/Telephony to add CONFERENCED state is what
causes the new child calls to now show since that is not added to
the whitelist in this CL (by design).
bug: 10334739
Change-Id: Iaeab3f8bc9bda7693fa4a27bb8d3fe5de4dc9dfc
Diffstat (limited to 'InCallUI/res/drawable-hdpi')
| -rw-r--r-- | InCallUI/res/drawable-hdpi/picture_conference.png | bin | 0 -> 3522 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/InCallUI/res/drawable-hdpi/picture_conference.png b/InCallUI/res/drawable-hdpi/picture_conference.png Binary files differnew file mode 100644 index 000000000..93743e620 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/picture_conference.png |
