diff options
author | Tyler Gunn <tgunn@google.com> | 2015-08-05 08:20:34 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2015-08-05 08:20:34 -0700 |
commit | 061fc22101930c3c69f454c85fbb85ff2c5c92fb (patch) | |
tree | ffd6b5e949faffb1907b0f9d0ba7880e449dcd76 /InCallUI/res | |
parent | 99f712322b481bce390626621a2f95b73122811a (diff) |
Last forwarded number and incoming call subject.
Last forwarded number:
- Added assets for the "forward" icon for last forwarded number.
- Modified InCall Call to store last forwarded number; also calls
onLastForwardedNumberChange callback (the last forwarded number is
received via a supp service update, so may change after call starts).
Call subject (i.e. instant lettering):
- Added placeholder subject_bubble asset to form the chat bubble for
incoming calls with a subject.
- Modified InCall Call to store the call subject (expected to be populated
in extras at start of call.
- Added code to hide the call status (e.g. "incoming call via XYZ") line
and primary call label (e.g. a location "California", or the number type
"Mobile" for the number). This was necessary to make room for the call
subject bubble, and is in line with the UX mocks.
- Change call subject text color to background color of call card (per
UX mocks)
- Modified call notification to show call subject if it is specified.
- Moved code to show HD icon into common method.
Bug: 22685114
Change-Id: I22d9dae16658490e3245cfdd9c936bb0584cd6db
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png | bin | 0 -> 139 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png | bin | 0 -> 117 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png | bin | 0 -> 159 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png | bin | 0 -> 204 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png | bin | 0 -> 236 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png | bin | 0 -> 611 bytes | |||
-rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 30 |
7 files changed, 30 insertions, 0 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..a0711d377 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_forward_white_24dp.png diff --git a/InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..65f73299f --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_forward_white_24dp.png diff --git a/InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..7a5df52bf --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_forward_white_24dp.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..7bd5b1635 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_forward_white_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png b/InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..428009cfe --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/ic_forward_white_24dp.png diff --git a/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png b/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png Binary files differnew file mode 100644 index 000000000..2627bf8f7 --- /dev/null +++ b/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index c680ed6b9..d65b07fe0 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -33,6 +33,27 @@ android:animateLayoutChanges="true" 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"> + + <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" @@ -108,6 +129,15 @@ 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" |