diff options
author | Brian Attwell <brianattwell@google.com> | 2014-07-10 22:03:16 -0700 |
---|---|---|
committer | Brian Attwell <brianattwell@google.com> | 2014-07-10 22:13:07 -0700 |
commit | 2e4214c79170cdb6c1b8b6ff0408925d3f512bec (patch) | |
tree | 1b01c26113defd03af3e0d49f205c528f575762a /res | |
parent | 6d147afdbb7dc4d11cfc3d54799e5993d73c08e5 (diff) | |
download | packages_apps_Contacts-2e4214c79170cdb6c1b8b6ff0408925d3f512bec.tar.gz packages_apps_Contacts-2e4214c79170cdb6c1b8b6ff0408925d3f512bec.tar.bz2 packages_apps_Contacts-2e4214c79170cdb6c1b8b6ff0408925d3f512bec.zip |
Clean up menus
Made sure to add titles to all menus
Bug: 16218365
Bug: 15845381
Change-Id: I52fc3c142080c3485753a939353f0d1be58a656b
Diffstat (limited to 'res')
-rw-r--r-- | res/menu-sw600dp/people_options.xml | 63 | ||||
-rw-r--r-- | res/menu-sw600dp/view_contact.xml | 38 | ||||
-rw-r--r-- | res/menu-sw600dp/view_group.xml | 28 | ||||
-rw-r--r-- | res/menu/people_options.xml | 1 | ||||
-rw-r--r-- | res/menu/quickcontact.xml | 3 | ||||
-rw-r--r-- | res/values/strings.xml | 3 |
6 files changed, 6 insertions, 130 deletions
diff --git a/res/menu-sw600dp/people_options.xml b/res/menu-sw600dp/people_options.xml deleted file mode 100644 index 931b45612..000000000 --- a/res/menu-sw600dp/people_options.xml +++ /dev/null @@ -1,63 +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_search" - android:icon="@drawable/ic_ab_search" - android:title="@string/menu_search" - android:showAsAction="ifRoom" /> - - <!-- Added orderInCategory to keep the following buttons at the end of the menu - Buttons will be added in the order added/inflated. Ordered buttons will be added - at the end according to the orderInCategory. This setup insures that the buttons below - will be the last buttons in the menu regardless of how many buttons are added - --> - <item - android:id="@+id/menu_contacts_filter" - android:orderInCategory="1" - android:title="@string/menu_contacts_filter" /> - - <item - android:id="@+id/menu_import_export" - android:orderInCategory="2" - android:title="@string/menu_import_export" /> - - <item - android:id="@+id/menu_clear_frequents" - android:orderInCategory="3" - android:title="@string/menu_clear_frequents" /> - - <item - android:id="@+id/menu_accounts" - android:orderInCategory="4" - android:title="@string/menu_accounts" /> - - <item - android:id="@+id/menu_settings" - android:orderInCategory="5" - android:title="@string/menu_settings" /> - - <item - android:id="@+id/menu_help" - android:orderInCategory="6" - android:title="@string/menu_help" /> - - <item - android:id="@+id/export_database" - android:title="@string/menu_export_database" - android:visible="false" - android:showAsAction="never" /> -</menu> diff --git a/res/menu-sw600dp/view_contact.xml b/res/menu-sw600dp/view_contact.xml deleted file mode 100644 index 5437dec61..000000000 --- a/res/menu-sw600dp/view_contact.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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_edit" - android:icon="@drawable/ic_menu_compose_holo_light" - android:title="@string/menu_editContact" - android:alphabeticShortcut="e" - android:showAsAction="always"/> - - <item - android:id="@+id/menu_share" - android:title="@string/menu_share" - android:alphabeticShortcut="s" /> - - <item - android:id="@+id/menu_delete" - android:title="@string/menu_deleteContact" /> - - <item - android:id="@+id/menu_create_contact_shortcut" - android:title="@string/menu_create_contact_shortcut" /> - -</menu> diff --git a/res/menu-sw600dp/view_group.xml b/res/menu-sw600dp/view_group.xml deleted file mode 100644 index b61588c50..000000000 --- a/res/menu-sw600dp/view_group.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_edit_group" - android:icon="@drawable/ic_menu_compose_holo_light" - android:title="@string/menu_editGroup" - android:alphabeticShortcut="e" - android:showAsAction="always" /> - - <item - android:id="@+id/menu_delete_group" - android:title="@string/menu_deleteGroup" /> -</menu> diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml index 4aae1a162..a7802f086 100644 --- a/res/menu/people_options.xml +++ b/res/menu/people_options.xml @@ -17,6 +17,7 @@ <item android:id="@+id/menu_search" android:icon="@drawable/ic_ab_search" + android:title="@string/menu_search" android:showAsAction="ifRoom" /> <item diff --git a/res/menu/quickcontact.xml b/res/menu/quickcontact.xml index 34a6a10b9..13caa5962 100644 --- a/res/menu/quickcontact.xml +++ b/res/menu/quickcontact.xml @@ -15,13 +15,14 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Icon and titles are set in code for menu_star and menu_edit --> + <item android:id="@+id/menu_star" android:showAsAction="always" /> <item android:id="@+id/menu_edit" - android:icon="@drawable/ic_create_24dp" android:showAsAction="always" /> <item diff --git a/res/values/strings.xml b/res/values/strings.xml index 9bd462144..772d21e8d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -326,6 +326,9 @@ <!-- The menu item to share the currently viewed contact [CHAR LIMIT=30] --> <string name="menu_share">Share</string> + <!-- The menu item to add the the currently viewed contact to your contacts [CHAR LIMIT=30] --> + <string name="menu_add_contact">Add to contacts</string> + <!-- Dialog title when picking the application to share a contact with. --> <string name="share_via">Share contact via</string> |