diff options
| author | Andrew Lee <anwlee@google.com> | 2014-07-22 17:02:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 16:21:19 +0000 |
| commit | 7a592827e19a3c347a1e15dd21d54285758574af (patch) | |
| tree | 51cd114b554586ede963a0132fbfe116d635cfda /res | |
| parent | c72260367362f684c883e1a6c760f90447cef626 (diff) | |
| parent | ddb824ecb3f052551b3ea97d5f5cb3037ec4c683 (diff) | |
| download | packages_apps_InCallUI-7a592827e19a3c347a1e15dd21d54285758574af.tar.gz packages_apps_InCallUI-7a592827e19a3c347a1e15dd21d54285758574af.tar.bz2 packages_apps_InCallUI-7a592827e19a3c347a1e15dd21d54285758574af.zip | |
Merge "Implement InCall overflow button." into lmp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/incall_overflow_menu.xml | 33 | ||||
| -rw-r--r-- | res/values/strings.xml | 11 |
2 files changed, 44 insertions, 0 deletions
diff --git a/res/menu/incall_overflow_menu.xml b/res/menu/incall_overflow_menu.xml new file mode 100644 index 00000000..06208ebd --- /dev/null +++ b/res/menu/incall_overflow_menu.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 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 + --> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/overflow_merge_menu_item" + android:title="@string/overflowMergeMenuItemText" /> + + <item android:id="@+id/overflow_add_menu_item" + android:title="@string/overflowAddMenuItemText" /> + + <item android:id="@+id/overflow_hold_menu_item" + android:title="@string/overflowHoldMenuItemText" /> + + <item android:id="@+id/overflow_resume_menu_item" + android:title="@string/overflowResumeMenuItemText" /> + + <item android:id="@+id/overflow_swap_menu_item" + android:title="@string/overflowSwapMenuItemText" /> +</menu> diff --git a/res/values/strings.xml b/res/values/strings.xml index 654eb7dd..0a0d86d5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -288,6 +288,17 @@ to dial using the physical keyboard --> <string name="dialerKeyboardHintText">Use keyboard to dial</string> + <!-- Text for the overflow "Hold call" menu item. --> + <string name="overflowHoldMenuItemText">Hold call</string> + <!-- Text for the overflow "Resume call" menu item. --> + <string name="overflowResumeMenuItemText">Resume call</string> + <!-- Text for the overflow "Add call" menu item. --> + <string name="overflowAddMenuItemText">Add call</string> + <!-- Text for the onscreen "Merge calls" menu item. --> + <string name="overflowMergeMenuItemText">Merge calls</string> + <!-- Text for the onscreen "Swap calls" menu item. --> + <string name="overflowSwapMenuItemText">Swap calls</string> + <!-- Text for the onscreen "Hold" button --> <string name="onscreenHoldText">Hold</string> <!-- Text for the onscreen "End call" button --> |