diff options
author | Nancy Chen <nancychen@google.com> | 2014-06-28 00:05:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-26 23:50:27 +0000 |
commit | 6ef97eab6e7965be6c51590a6e08c39e206aae87 (patch) | |
tree | 3d717c61384e7a7409680731360db18621d732a1 /InCallUI | |
parent | bdb5f2cdfc55a1c6bbeecceffd0e4d956df94c0c (diff) | |
parent | dcc35d39eaed569729d876288c1e352aa23dc10e (diff) |
Merge "Hook up subscription with InCallUI and use constant for icon dimensions"
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/layout/secondary_call_info.xml | 4 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallServiceImpl.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml index b926c9225..9382cfe31 100644 --- a/InCallUI/res/layout/secondary_call_info.xml +++ b/InCallUI/res/layout/secondary_call_info.xml @@ -48,8 +48,8 @@ android:orientation="horizontal" android:visibility="gone" > <ImageView android:id="@+id/secondaryCallProviderIcon" - android:layout_width="12dp" - android:layout_height="12dp" + android:layout_width="@dimen/call_provider_small_icon_size" + android:layout_height="@dimen/call_provider_small_icon_size" android:layout_marginRight="2dp" android:baselineAlignBottom="true" android:scaleType="centerInside" diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java index 1a629bd44..3ef49f03a 100644 --- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java +++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java @@ -123,6 +123,7 @@ public class InCallServiceImpl extends InCallService { call.setCapabilities(telecommCall.getCapabilities()); call.setConnectTimeMillis(telecommCall.getConnectTimeMillis()); call.setGatewayInfo(telecommCall.getGatewayInfo()); + call.setSubscription(telecommCall.getSubscription()); call.setCurrentCallServiceDescriptor(telecommCall.getCurrentCallServiceDescriptor()); call.setHandoffCallServiceDescriptor(telecommCall.getHandoffCallServiceDescriptor()); call.setState(translateState(telecommCall.getState())); |