diff options
| author | Nancy Chen <nancychen@google.com> | 2014-06-26 09:21:58 -0700 |
|---|---|---|
| committer | Nancy Chen <nancychen@google.com> | 2014-06-26 09:23:01 -0700 |
| commit | dcc35d39eaed569729d876288c1e352aa23dc10e (patch) | |
| tree | 5d977fc5ad8d2c8ed55af6d044fc8f126419cdb6 | |
| parent | 0a61810627d3e2ba7a0afefa247a1120c31ca086 (diff) | |
Hook up subscription with InCallUI and use constant for icon dimensions
Pass subscription information from Dialer to InCallUI
Bug: 15473965
Change-Id: Id6848b1b29f1376b8a941f7d1cb905efd6a76c09
| -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())); |