diff options
| author | Suchand Ghosh <suchan@codeaurora.org> | 2014-08-18 15:45:22 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:40:28 -0700 |
| commit | 34ec9419a0192060120ecf3da6e4c25d3307d93f (patch) | |
| tree | 33f3e4e486ef7f8be82e14750582d96aa5b1218d | |
| parent | 4df654941ada97472c7b4d0b9a4655d9a290b08c (diff) | |
| download | android_packages_apps_PhoneCommon-34ec9419a0192060120ecf3da6e4c25d3307d93f.tar.gz android_packages_apps_PhoneCommon-34ec9419a0192060120ecf3da6e4c25d3307d93f.tar.bz2 android_packages_apps_PhoneCommon-34ec9419a0192060120ecf3da6e4c25d3307d93f.zip | |
Dialer app changes for IMS
IMS Conference URI UI changes
1. Add a new button for initiating conference
URI call in the Dial screen.
CRs-Fixed: 681851
Conflicts:
res/values/strings.xml
Change-Id: If78c82bec2d583f9012ea2e824589a6099f76a94
| -rw-r--r-- | res/layout/dialpad_view.xml | 16 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml index a6ff7aa..d0200a0 100644 --- a/res/layout/dialpad_view.xml +++ b/res/layout/dialpad_view.xml @@ -77,6 +77,22 @@ android:state_enabled="false" android:contentDescription="@string/description_delete_button" android:src="@drawable/ic_dialpad_delete" /> + + <EditText + android:id="@+id/recipients" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_gravity="center" + android:layout_marginLeft="8dip" + android:layout_weight="1" + android:autoText="true" + android:background="@android:color/transparent" + android:hint="@string/to_hint" + android:maxLength="2000" + android:maxLines="3" + android:minHeight="48dip" + android:textColor="@color/dialpad_digits_text_color" + android:textSize="16sp" /> </LinearLayout> <View diff --git a/res/values/strings.xml b/res/values/strings.xml index eb6dbdb..66aa769 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -129,4 +129,5 @@ <!-- In-call screen: message displayed in an error dialog --> <string name="incall_error_missing_voicemail_number">Voicemail number unknown.</string> + <string name="to_hint">1111:to;sip:abby@example.com:bcc;sip:bill@example.com:cc;</string> </resources> |