summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorKamaljeet Maini <kmaini@cyngn.com>2016-04-06 10:23:26 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-04-07 12:01:21 -0700
commitd69ce6c2a65c3d451dfb5837678221e56fef1880 (patch)
treeea8db94b75bf3b692c6112904b360ced0772ed9f /res
parent90413335f2b2ebb864fab518bceeb8b1f308c7b2 (diff)
downloadandroid_packages_apps_InCallUI-d69ce6c2a65c3d451dfb5837678221e56fef1880.tar.gz
android_packages_apps_InCallUI-d69ce6c2a65c3d451dfb5837678221e56fef1880.tar.bz2
android_packages_apps_InCallUI-d69ce6c2a65c3d451dfb5837678221e56fef1880.zip
Port call transfer feature from DialerNext to AOSP Dialercm-13-before-ambientsdk
Change-Id: I088b2cc8ce7c55f527d086f5827eac59cc3ca6c8 Issue-Id: CYNGNOS-1010
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_shuffle_white_24dp.pngbin0 -> 300 bytes
-rw-r--r--res/drawable-mdpi/ic_shuffle_white_24dp.pngbin0 -> 217 bytes
-rw-r--r--res/drawable-xhdpi/ic_shuffle_white_24dp.pngbin0 -> 310 bytes
-rw-r--r--res/drawable-xxhdpi/ic_shuffle_white_24dp.pngbin0 -> 486 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_shuffle_white_24dp.pngbin0 -> 517 bytes
-rw-r--r--res/drawable/btn_transfer_call.xml32
-rw-r--r--res/layout/call_button_fragment.xml6
-rw-r--r--res/values/cm_strings.xml1
8 files changed, 39 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_shuffle_white_24dp.png b/res/drawable-hdpi/ic_shuffle_white_24dp.png
new file mode 100644
index 00000000..ab55a83f
--- /dev/null
+++ b/res/drawable-hdpi/ic_shuffle_white_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_shuffle_white_24dp.png b/res/drawable-mdpi/ic_shuffle_white_24dp.png
new file mode 100644
index 00000000..d13a258a
--- /dev/null
+++ b/res/drawable-mdpi/ic_shuffle_white_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_shuffle_white_24dp.png b/res/drawable-xhdpi/ic_shuffle_white_24dp.png
new file mode 100644
index 00000000..66c15ce6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_shuffle_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_shuffle_white_24dp.png b/res/drawable-xxhdpi/ic_shuffle_white_24dp.png
new file mode 100644
index 00000000..dc8e5341
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_shuffle_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_shuffle_white_24dp.png b/res/drawable-xxxhdpi/ic_shuffle_white_24dp.png
new file mode 100644
index 00000000..e24dfa3b
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_shuffle_white_24dp.png
Binary files differ
diff --git a/res/drawable/btn_transfer_call.xml b/res/drawable/btn_transfer_call.xml
new file mode 100644
index 00000000..38d35f1b
--- /dev/null
+++ b/res/drawable/btn_transfer_call.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2016 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
+ -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/backgroundItem"
+ android:drawable="@drawable/btn_background" />
+
+ <item>
+ <bitmap
+ android:src="@drawable/ic_shuffle_white_24dp"
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
+ </item>
+
+</layer-list>
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml
index e40d47e2..1842d88b 100644
--- a/res/layout/call_button_fragment.xml
+++ b/res/layout/call_button_fragment.xml
@@ -158,6 +158,12 @@
android:contentDescription="@string/onscreenCallRecordText"
android:visibility="gone" />
+ <ImageButton android:id="@+id/transferCall"
+ style="@style/InCallButton"
+ android:background="@drawable/btn_transfer_call"
+ android:contentDescription="@string/onscreenTransferCall"
+ android:visibility="gone" />
+
<!-- "Overflow" -->
<ImageButton android:id="@+id/overflowButton"
style="@style/InCallButton"
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e486a4c5..29c74c16 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -43,4 +43,5 @@
<string name="recording_time_text">Recording</string>
<string name="recording_warning_title">Enable call recording?</string>
<string name="recording_warning_text">Notice: You are responsible for compliance with any laws, regulations and rules that apply to the use of call recording functionality and the use or distribution of those recordings.</string>
+ <string name="onscreenTransferCall">Transfer call</string>
</resources>