diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-03 10:48:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-03 10:48:57 -0700 |
| commit | 1fd53d00bf597c15a62c76811df66eb9068ebfb3 (patch) | |
| tree | 4622931111306cb9bf7f9239a77d3ef10804a9ea /res | |
| parent | 8cd924a17073325562d5666ab766c57813d2a165 (diff) | |
| parent | 2a66648a68cb8bb88dcf3b25ebbcbae39ff77a07 (diff) | |
am 2a66648a: Merge "Add All contacts option to overflow menu" into klp-dev
* commit '2a66648a68cb8bb88dcf3b25ebbcbae39ff77a07':
Add All contacts option to overflow menu
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/dialtacts_options.xml | 5 | ||||
| -rw-r--r-- | res/menu/phone_favorite_options.xml | 28 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
3 files changed, 7 insertions, 29 deletions
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index b30697956..7e84818a1 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -21,9 +21,12 @@ android:id="@+id/menu_clear_frequents" android:title="@string/menu_clear_frequents" /> <item - android:id="@+id/add_contact" + android:id="@+id/menu_add_contact" android:title="@string/menu_newContact"/> <item + android:id="@+id/menu_all_contacts" + android:title="@string/menu_allContacts"/> + <item android:id="@+id/menu_call_settings" android:title="@string/call_settings" android:orderInCategory="2" /> diff --git a/res/menu/phone_favorite_options.xml b/res/menu/phone_favorite_options.xml deleted file mode 100644 index e37759c14..000000000 --- a/res/menu/phone_favorite_options.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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/menu_import_export" - android:title="@string/menu_import_export" /> - - <item - android:id="@+id/menu_clear_frequents" - android:title="@string/menu_clear_frequents" /> - - <item - android:id="@+id/menu_accounts" - android:title="@string/menu_accounts" /> -</menu> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3235d774e..65746bb04 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -338,6 +338,9 @@ <!-- Menu item to create a new contact --> <string name="menu_newContact">New contact</string> + <!-- Menu item to display all contacts --> + <string name="menu_allContacts">All contacts</string> + <!-- Title bar for call detail screen --> <string name="callDetailTitle">Call details</string> |