Merge "Add the city/locality to the displayed business information." into ub-contactsdialer-a-dev
diff --git a/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 0eff695..0000000
--- a/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 58a5f16..0000000
--- a/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index ad980b1..0000000
--- a/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index da15c33..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 6496626..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 27fe093..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 0187a02..0000000
--- a/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 719b923..0000000
--- a/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 983d5d9..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 317b329..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 2cb03e7..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 2d28009..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png
deleted file mode 100644
index 84155cc..0000000
--- a/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index fcf4367..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 74b6cf0..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 54b7965..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png
deleted file mode 100644
index 7528064..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxxhdpi/fab_green.png b/InCallUI/res/drawable-xxxhdpi/fab_green.png
deleted file mode 100644
index aa8849e..0000000
--- a/InCallUI/res/drawable-xxxhdpi/fab_green.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index ea6605b..c03b9683 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -41,170 +41,169 @@
android:clipToPadding="false"
android:gravity="center">
- <LinearLayout android:id="@+id/callSubjectLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:clipChildren="false"
- android:clipToPadding="false">
+ <LinearLayout android:id="@+id/callSubjectLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:clipChildren="false"
+ android:clipToPadding="false">
- <TextView android:id="@+id/callSubject"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAlignment="viewStart"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/incall_call_banner_background_color"
- android:textSize="@dimen/call_label_text_size"
- android:background="@drawable/subject_bubble"
- android:maxLines="2"
- android:ellipsize="end"
- android:singleLine="false"
- android:visibility="gone" />
- </LinearLayout>
+ <TextView android:id="@+id/callSubject"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAlignment="viewStart"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/incall_call_banner_background_color"
+ android:textSize="@dimen/call_label_text_size"
+ android:background="@drawable/subject_bubble"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:singleLine="false"
+ android:visibility="gone" />
+ </LinearLayout>
- <LinearLayout android:id="@+id/callStateButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:clipChildren="false"
- android:clipToPadding="false">
-
- <!-- Subscription provider or WiFi calling icon displayed to the left of the label -->
- <ImageView android:id="@+id/callStateIcon"
- android:layout_width="24dp"
- android:layout_height="match_parent"
- android:layout_marginEnd="10dp"
- android:tint="@color/incall_accent_color"
- android:alpha="0.0"
- android:scaleType="fitCenter"
- android:visibility="gone" />
-
- <ImageView android:id="@+id/videoCallIcon"
- android:src="@drawable/ic_toolbar_video"
- android:layout_width="16dp"
- android:layout_height="match_parent"
- android:layout_marginEnd="16dp"
- android:baselineAlignBottom="true"
- android:tint="@color/incall_accent_color"
- android:scaleType="center"
- android:visibility="gone" />
-
- <com.android.phone.common.widget.ResizingTextTextView
- xmlns:ex="http://schemas.android.com/apk/res-auto"
- android:id="@+id/callStateLabel"
+ <LinearLayout android:id="@+id/callStateButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:clipChildren="false"
+ android:clipToPadding="false">
+
+ <!-- Subscription provider or WiFi calling icon displayed to the left of the label -->
+ <ImageView android:id="@+id/callStateIcon"
+ android:layout_width="24dp"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="10dp"
+ android:tint="@color/incall_accent_color"
+ android:alpha="0.0"
+ android:scaleType="fitCenter"
+ android:visibility="gone" />
+
+ <ImageView android:id="@+id/videoCallIcon"
+ android:src="@drawable/ic_toolbar_video"
+ android:layout_width="16dp"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="16dp"
+ android:baselineAlignBottom="true"
+ android:tint="@color/incall_accent_color"
+ android:scaleType="center"
+ android:visibility="gone" />
+
+ <com.android.phone.common.widget.ResizingTextTextView
+ xmlns:ex="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/callStateLabel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAlignment="viewStart"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="@color/incall_accent_color"
+ android:textSize="@dimen/call_status_text_size"
+ android:alpha="0.7"
+ android:singleLine="true"
+ android:gravity="start"
+ android:ellipsize="end"
+ ex:resizing_text_min_size="@dimen/call_status_text_min_size" />
+
+ </LinearLayout>
+
+ <!-- Name (or the phone number, if we don't have a name to display). -->
+ <com.android.phone.common.widget.ResizingTextTextView
+ xmlns:ex="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-5dp"
+ android:fontFamily="sans-serif-light"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="@color/incall_accent_color"
- android:textSize="@dimen/call_status_text_size"
- android:alpha="0.7"
+ android:textSize="@dimen/call_name_text_size"
android:singleLine="true"
- android:gravity="start"
- android:ellipsize="end"
- ex:resizing_text_min_size="@dimen/call_status_text_min_size" />
+ ex:resizing_text_min_size="@dimen/call_name_text_min_size" />
- </LinearLayout>
-
- <!-- Name (or the phone number, if we don't have a name to display). -->
- <com.android.phone.common.widget.ResizingTextTextView
- xmlns:ex="http://schemas.android.com/apk/res-auto"
- android:id="@+id/name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="-5dp"
- android:fontFamily="sans-serif-light"
- android:textAlignment="viewStart"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/call_name_text_size"
- android:singleLine="true"
- ex:resizing_text_min_size="@dimen/call_name_text_min_size" />
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:clipChildren="false"
- android:clipToPadding="false">
-
- <ImageView android:id="@+id/hdAudioIcon"
- android:src="@drawable/ic_hd_24dp"
- android:layout_width="24dp"
- android:layout_height="match_parent"
- android:layout_marginEnd="8dp"
- android:tint="@color/incall_call_banner_subtext_color"
- android:scaleType="fitCenter"
- android:visibility="gone" />
-
- <ImageView android:id="@+id/forwardIcon"
- android:src="@drawable/ic_forward_white_24dp"
- android:layout_width="24dp"
- android:layout_height="match_parent"
- android:layout_marginEnd="8dp"
- android:tint="@color/incall_call_banner_subtext_color"
- android:scaleType="fitCenter"
- android:visibility="gone" />
-
- <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
- <LinearLayout android:id="@+id/labelAndNumber"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:clipChildren="false"
+ android:clipToPadding="false">
- <TextView android:id="@+id/label"
+ <ImageView android:id="@+id/hdAudioIcon"
+ android:src="@drawable/ic_hd_24dp"
+ android:layout_width="24dp"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="8dp"
+ android:tint="@color/incall_call_banner_subtext_color"
+ android:scaleType="fitCenter"
+ android:visibility="gone" />
+
+ <ImageView android:id="@+id/forwardIcon"
+ android:src="@drawable/ic_forward_white_24dp"
+ android:layout_width="24dp"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="8dp"
+ android:tint="@color/incall_call_banner_subtext_color"
+ android:scaleType="fitCenter"
+ android:visibility="gone" />
+
+ <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
+ <LinearLayout android:id="@+id/labelAndNumber"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal">
+
+ <TextView android:id="@+id/label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/incall_call_banner_subtext_color"
+ android:textSize="@dimen/call_label_text_size"
+ android:singleLine="true"
+ android:textDirection="ltr"
+ android:visibility="gone" />
+
+ <TextView android:id="@+id/phoneNumber"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="6dp"
+ android:textAlignment="viewStart"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/incall_call_banner_subtext_color"
+ android:textSize="@dimen/call_label_text_size"
+ android:singleLine="false"
+ android:visibility="gone" />
+
+ </LinearLayout>
+
+ <!-- Elapsed time indication for a call in progress. -->
+ <TextView android:id="@+id/elapsedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
+ android:textAlignment="viewEnd"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/incall_call_banner_subtext_color"
android:textSize="@dimen/call_label_text_size"
android:singleLine="true"
- android:textDirection="ltr"
- android:visibility="gone" />
-
- <TextView android:id="@+id/phoneNumber"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginStart="6dp"
- android:textAlignment="viewStart"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/incall_call_banner_subtext_color"
- android:textSize="@dimen/call_label_text_size"
- android:singleLine="false"
android:visibility="gone" />
</LinearLayout>
- <!-- Elapsed time indication for a call in progress. -->
- <TextView android:id="@+id/elapsedTime"
+ <!-- Call type indication: a special label and/or branding
+ for certain kinds of calls (like "SIP call" for a SIP call.) -->
+ <TextView android:id="@+id/callTypeLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:textAlignment="viewEnd"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/incall_call_banner_subtext_color"
- android:textSize="@dimen/call_label_text_size"
- android:singleLine="true"
+ android:textColor="@color/incall_call_banner_text_color"
+ android:maxLines="1"
+ android:ellipsize="end"
android:visibility="gone" />
</LinearLayout>
- <!-- Call type indication: a special label and/or branding
- for certain kinds of calls (like "SIP call" for a SIP call.) -->
- <TextView android:id="@+id/callTypeLabel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/incall_call_banner_text_color"
- android:maxLines="1"
- android:ellipsize="end"
- android:visibility="gone" />
-
- </LinearLayout>
-
<!-- Contact photo for primary call info -->
<ImageView android:id="@+id/photoSmall"
android:layout_width="@dimen/contact_context_small_photo_size"
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index fa4e8b4..0d63554 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -1156,7 +1156,7 @@
}
mCallButtonsContainer.setBackgroundColor(themeColors.mPrimaryColor);
mCallSubject.setTextColor(themeColors.mPrimaryColor);
- mCallCardContent.setBackgroundColor(themeColors.mPrimaryColor);
+ mContactContext.setBackgroundColor(themeColors.mPrimaryColor);
//TODO: set color of message text in call context "recent messages" to be the theme color.
mCurrentThemeColors = themeColors;
