diff options
| author | Ethan Chen <intervigil@gmail.com> | 2015-11-21 21:58:08 -0800 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2015-11-21 22:13:53 -0800 |
| commit | 51d80e39878305ffdccdf62ee7203a7af37208bb (patch) | |
| tree | 6f8a1b7798104785d0aa8533c1ed642207f83718 /res/menu | |
| parent | d0a1a54b21e592c0de16ff72ac6876f8d051bd5f (diff) | |
| download | packages_apps_Dialer-51d80e39878305ffdccdf62ee7203a7af37208bb.tar.gz packages_apps_Dialer-51d80e39878305ffdccdf62ee7203a7af37208bb.tar.bz2 packages_apps_Dialer-51d80e39878305ffdccdf62ee7203a7af37208bb.zip | |
Undo CAF Dialer IMS conference changes
* This causes weirdness with the FAB in dialtacts. Get rid of it.
* Squash of the following
Revert "IMS: Enable entry 4G conference call in Dialer"
This reverts commit 76c9726e48ccbbcb5780ab076b7c54aadcdc621b.
Change-Id: Ic326c817496294a9350c767f5ae3e83d817edd18
Revert "IMS: Fix empty URI list dial after add participant."
This reverts commit daba64924bbea8a0eb49723d69c1178a7c2ef0f2.
Revert "IMS: Fix Edit before call option not working issue"
This reverts commit 2fec8e35dabf931fc349f7d594c5560fbf35bcc5.
Revert "IMS: Fix to remove unwanted group conference icon."
This reverts commit d3bbfca9fa5db701f719618d9314625626f504db.
Revert "Dialer app changes for IMS"
This reverts commit 8ea43d354391cd7c75dd361a316e5936e1e1db96.
Change-Id: I187d935394e9a935d199b66b28910a38a248b535
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/dialpad_options.xml | 4 | ||||
| -rw-r--r-- | res/menu/dialtacts_options.xml | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml index 00c0f1e18..63fca07da 100644 --- a/res/menu/dialpad_options.xml +++ b/res/menu/dialpad_options.xml @@ -16,10 +16,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_add_to_4g_conference_call" - android:title="@string/menu_add_to_4g_conference_call" - android:showAsAction="withText" /> - <item android:id="@+id/menu_2s_pause" android:title="@string/add_2sec_pause" android:showAsAction="withText" /> diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index 768848ba9..8a9e25f7f 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -16,9 +16,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_4g_conference_call" - android:title="@string/menu_4g_conference_call" /> - <item android:id="@+id/menu_history" android:icon="@drawable/ic_menu_history_lt" android:title="@string/action_menu_call_history_description" /> |