am 44c90025: am 020f3f3f: am 00f17642: Merge "Add conference call icon to secondary call info." into lmp-dev

* commit '44c90025d10dc7bf3306d17ae80ec6b479254d0e':
  Add conference call icon to secondary call info.

3 files changed, 26 insertions, 5 deletions

diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml
index 375f88827..13d8fca58 100644
--- a/InCallUI/res/layout/manage_conference_call_button.xml
+++ b/InCallUI/res/layout/manage_conference_call_button.xml
@@ -38,12 +38,12 @@
             android:layout_height="wrap_content"
             android:src="@drawable/ic_group_white_24dp"
             android:tint="@color/incall_banner_secondary_text_color"
-            android:contentDescription="@string/onscreenManageConferenceText" />
+            android:contentDescription="@string/onscreenManageConferenceText"
+            android:paddingEnd="16dp" />
 
         <TextView android:id="@+id/manageConferenceButtonLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="24dp"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/incall_banner_secondary_text_color"
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 8106dff0b..46d7316c1 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -36,11 +36,19 @@
         android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
         android:background="?android:attr/selectableItemBackground">
 
+        <ImageView android:id="@+id/secondaryCallConferenceCallIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_group_white_24dp"
+            android:tint="@color/incall_banner_secondary_text_color"
+            android:paddingEnd="16dp"/>
+
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
+
             <!-- Name (or the phone number, if we don't have a name to display). -->
             <TextView android:id="@+id/secondaryCallName"
                 android:layout_width="match_parent"
@@ -49,18 +57,21 @@
                 android:textColor="@color/incall_banner_secondary_text_color"
                 android:ellipsize="marquee"
                 android:singleLine="true"/>
+
             <!-- Provider, e.g. AT&T, that a call is associated with -->
             <LinearLayout android:id="@+id/secondary_call_provider_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:visibility="gone" >
+
                 <ImageView android:id="@+id/secondaryCallProviderIcon"
                     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" />
+
                 <TextView android:id="@+id/secondaryCallProviderLabel"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -68,7 +79,9 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@color/incall_banner_secondary_text_color"
                     android:singleLine="true"/>
+
             </LinearLayout>
+
         </LinearLayout>
 
         <!-- Call status of the background call, usually the string "On hold". -->
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index dd96d50d0..e5ce42a0e 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -90,6 +90,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private View mSecondaryCallProviderInfo;
     private TextView mSecondaryCallProviderLabel;
     private ImageView mSecondaryCallProviderIcon;
+    private View mSecondaryCallConferenceCallIcon;
     private View mProgressSpinner;
 
     private View mManageConferenceCallButton;
@@ -466,14 +467,17 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         }
 
         if (show) {
+            boolean hasProvider = !TextUtils.isEmpty(providerLabel);
+            showAndInitializeSecondaryCallInfo(hasProvider);
+
             if (isConference) {
                 name = getConferenceString(isGeneric);
                 nameIsNumber = false;
+                mSecondaryCallConferenceCallIcon.setVisibility(View.VISIBLE);
+            } else {
+                mSecondaryCallConferenceCallIcon.setVisibility(View.GONE);
             }
 
-            boolean hasProvider = !TextUtils.isEmpty(providerLabel);
-            showAndInitializeSecondaryCallInfo(hasProvider);
-
             mSecondaryCallName.setText(name);
             if (hasProvider) {
                 mSecondaryCallProviderLabel.setText(providerLabel);
@@ -488,6 +492,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         } else {
             mSecondaryCallInfo.setVisibility(View.GONE);
         }
+
+
     }
 
     @Override
@@ -792,6 +798,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         // until mSecondaryCallInfo is inflated in the call above.
         if (mSecondaryCallName == null) {
             mSecondaryCallName = (TextView) getView().findViewById(R.id.secondaryCallName);
+            mSecondaryCallConferenceCallIcon =
+                    getView().findViewById(R.id.secondaryCallConferenceCallIcon);
             if (hasProvider) {
                 mSecondaryCallProviderInfo.setVisibility(View.VISIBLE);
                 mSecondaryCallProviderLabel = (TextView) getView()