diff options
author | Suchand Ghosh <suchan@codeaurora.org> | 2014-08-18 15:45:22 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:11:23 -0600 |
commit | ea893d5ca636bd289b09a63b5f1aa6ba1cf376e4 (patch) | |
tree | c11b429336ffd0d8267654be0b15b9fe23bc91d7 | |
parent | fb70f8befe1fe8f1bf47e1f936791bc2fbaa43bc (diff) | |
download | android_packages_apps_PhoneCommon-cm-14.0.tar.gz android_packages_apps_PhoneCommon-cm-14.0.tar.bz2 android_packages_apps_PhoneCommon-cm-14.0.zip |
Dialer app changes for IMSstaging/cm-14.0-cafcm-14.0
IMS Conference URI UI changes
1. EditText for initiating conference
URI call in the Dial screen.
2. Hint to be displayed in edittext
Change-Id: If78c82bec2d583f9012ea2e824589a6099f76a94
Fix to remove unwanted string in Dialer
Set the visibility of recipients view to gone
CRs-Fixed: 1023218
Change-Id: Iefb0a4e2a6bf233c2bef03a261c642ba7f0b66b4
-rw-r--r-- | res/layout/dialpad_view_unthemed.xml | 17 | ||||
-rw-r--r-- | res/values/strings.xml | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml index 16b6208..7bc4536 100644 --- a/res/layout/dialpad_view_unthemed.xml +++ b/res/layout/dialpad_view_unthemed.xml @@ -126,6 +126,23 @@ 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" + android:visibility="gone"/> </LinearLayout> <View diff --git a/res/values/strings.xml b/res/values/strings.xml index f2b3356..3431aab 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -124,4 +124,5 @@ <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, this is shown instead. For example, if the ringtone was on a SD card and it had been removed, this would be shown for ringtones on that SD card. --> <string name="ringtone_unknown">Unknown ringtone</string> + <string name="to_hint">1111:to;sip:abby@example.com:bcc;sip:bill@example.com:cc;</string> </resources> |