diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-25 12:19:35 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-08-27 10:41:09 -0700 |
commit | 3a7108ae5fc630730457957629b1115dcc991454 (patch) | |
tree | 3d3ec5b7f9b6adc8608d5dbf0e00dc393e1cccc7 /InCallUI/src/com/android/incallui/ContactInfoCache.java | |
parent | 677b93933325b6ba617a765faffe76519504daeb (diff) |
Restyle conference call manager screen.
+ Swap out/in new assets for end/split icons in the manager screen,
and the splash screen in the InCall screen.
- Removed unused conference call manager code, including things like
chronometer and the "done" button.
+ Replaced custom action bar in conferece call manager with standard
action bar.
+ Added contact image (does not open quick contact) in the list of
calls in the conference call manager. This is done with a lookup
using the contact photo manager, and required adding the lookup key
to the ContactCacheEntry.
+ Handled a missing Call.State case in CallCardFragment for calls
with state CONFERENCED which caused crashes.
+ Misc style changes on conference call manager: colors, sizes,
paddings.
+ Adjusted elevations so dialpad covers manager/secondary buttons.
+ Added ripple to manager/secondary buttons.
Bug: 15862303
Change-Id: Iab9b6421d5a1ea69cd951a459d46c065f9456a8f
Diffstat (limited to 'InCallUI/src/com/android/incallui/ContactInfoCache.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/ContactInfoCache.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java index ccf5b794b..488e55bfc 100644 --- a/InCallUI/src/com/android/incallui/ContactInfoCache.java +++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java @@ -328,6 +328,8 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete } cce.photo = photo; + cce.lookupKey = info.lookupKeyOrNull; + return cce; } @@ -503,6 +505,7 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete /** Either a display photo or a thumbnail URI. */ public Uri displayPhotoUri; public Uri lookupUri; // Sent to NotificationMananger + public String lookupKey; @Override public String toString() { |