diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-08-12 09:40:17 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2015-08-12 09:40:17 -0700 |
| commit | e51f0e30f059804176b323a987edc3d708bc7ed5 (patch) | |
| tree | fbf2530dbb915c5cb4d47119e58ace55cd183eb7 | |
| parent | 6ccbf8fdfb791d56bfd8f46d4bde2f52190eaf1f (diff) | |
| download | InCallUI-e51f0e30f059804176b323a987edc3d708bc7ed5.tar.gz | |
Replace placeholder subject bubble asset with a drawable resource.
Turns out it was pretty easy to accomplish the speech bubble with just
a drawable with some of the corner rounded.
Bug: 22685114
Change-Id: I1f2d1b8113652503cd8298f8b6ab1883b4a4589d
| -rw-r--r-- | res/drawable-xxxhdpi/subject_bubble.9.png | bin | 611 -> 0 bytes | |||
| -rw-r--r-- | res/drawable/subject_bubble.xml | 22 | ||||
| -rw-r--r-- | src/com/android/incallui/Call.java | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/res/drawable-xxxhdpi/subject_bubble.9.png b/res/drawable-xxxhdpi/subject_bubble.9.png Binary files differdeleted file mode 100644 index 2627bf8f..00000000 --- a/res/drawable-xxxhdpi/subject_bubble.9.png +++ /dev/null diff --git a/res/drawable/subject_bubble.xml b/res/drawable/subject_bubble.xml new file mode 100644 index 00000000..adab6783 --- /dev/null +++ b/res/drawable/subject_bubble.xml @@ -0,0 +1,22 @@ +<!-- + ~ Copyright (C) 2015 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#ffffff" /> + <padding android:left="10dp" android:top="10dp" android:right="10dp" android:bottom="10dp" /> + <corners android:topLeftRadius="6dp" android:topRightRadius="6dp" + android:bottomLeftRadius="0dp" android:bottomRightRadius="6dp"/> +</shape>
\ No newline at end of file diff --git a/src/com/android/incallui/Call.java b/src/com/android/incallui/Call.java index 191ffe79..f08653e6 100644 --- a/src/com/android/incallui/Call.java +++ b/src/com/android/incallui/Call.java @@ -590,7 +590,7 @@ public class Call { public void setSessionModificationState(int state) { if (state == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { Log.e(this, - "setSessionModificationState not to be called for RECEIVED_UPGRADE_TO_VIDEO_REQUEST"); + "setSessionModificationState not valid for RECEIVED_UPGRADE_TO_VIDEO_REQUEST"); return; } |
