summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/drawable-xxxhdpi/subject_bubble.9.pngbin611 -> 0 bytes
-rw-r--r--InCallUI/res/drawable/subject_bubble.xml22
-rw-r--r--InCallUI/src/com/android/incallui/Call.java2
3 files changed, 23 insertions, 1 deletions
diff --git a/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png b/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png
deleted file mode 100644
index 2627bf8f7..000000000
--- a/InCallUI/res/drawable-xxxhdpi/subject_bubble.9.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable/subject_bubble.xml b/InCallUI/res/drawable/subject_bubble.xml
new file mode 100644
index 000000000..adab67833
--- /dev/null
+++ b/InCallUI/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/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index 191ffe791..f08653e65 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/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;
}