diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:47:40 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:47:40 -0800 |
| commit | 412dd31efe837c14f09a56511d93e2a7150cd340 (patch) | |
| tree | d23d705334d4f70bc152e55dec4f4331ee6649bc /res/menu | |
| parent | 3cb06ac57579ba579ba4954401a56cf93848d77f (diff) | |
| parent | b59d8189fed931d934743357457821579187c281 (diff) | |
| download | packages_apps_Dialer-412dd31efe837c14f09a56511d93e2a7150cd340.tar.gz packages_apps_Dialer-412dd31efe837c14f09a56511d93e2a7150cd340.tar.bz2 packages_apps_Dialer-412dd31efe837c14f09a56511d93e2a7150cd340.zip | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Dialer into cm-13.0
Change-Id: I7350711cbc7e909f7dae5a23af8ccf84bbb9d77e
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, 7 insertions, 0 deletions
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml index 63fca07da..00c0f1e18 100644 --- a/res/menu/dialpad_options.xml +++ b/res/menu/dialpad_options.xml @@ -16,6 +16,10 @@ <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 8a9e25f7f..768848ba9 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -16,6 +16,9 @@ <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" /> |