diff options
author | Yorke Lee <yorkelee@google.com> | 2013-08-08 10:24:27 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2013-08-08 11:54:47 -0700 |
commit | 8898cd0577d41cfa4e6acf785c9e904bd71fbdfd (patch) | |
tree | cf252b828f4ffb907effaa822f6e8df6a1f68f33 /res/menu | |
parent | 243cc85743504c7ac444e988d4e8ab6cbe8a7716 (diff) | |
download | android_packages_apps_Dialer-8898cd0577d41cfa4e6acf785c9e904bd71fbdfd.tar.gz android_packages_apps_Dialer-8898cd0577d41cfa4e6acf785c9e904bd71fbdfd.tar.bz2 android_packages_apps_Dialer-8898cd0577d41cfa4e6acf785c9e904bd71fbdfd.zip |
Removing and renaming classes from Dialer
* No code was changed, just either removed or renamed
* Reshuffled a couple of ids around in dialpad_fragment to fix some
compile time errors that somehow weren't caught before
Change-Id: I9e2381edfb14b0940015deb8cbd94786a1242f43
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/call_log_options.xml | 34 | ||||
-rw-r--r-- | res/menu/call_log_options_new.xml | 22 | ||||
-rw-r--r-- | res/menu/dialpad_options.xml | 7 | ||||
-rw-r--r-- | res/menu/dialpad_options_new.xml | 32 | ||||
-rw-r--r-- | res/menu/dialtacts_options.xml | 40 | ||||
-rw-r--r-- | res/menu/dialtacts_options_new.xml | 30 |
6 files changed, 10 insertions, 155 deletions
diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml index bf2973f6c..50b1cad5b 100644 --- a/res/menu/call_log_options.xml +++ b/res/menu/call_log_options.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -14,38 +14,6 @@ limitations under the License. --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/show_all_calls" - android:title="@string/menu_show_all_calls" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_voicemails_only" - android:title="@string/menu_show_voicemails_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_missed_only" - android:title="@string/menu_show_missed_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_outgoing_only" - android:title="@string/menu_show_outgoing_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item - android:id="@+id/show_incoming_only" - android:title="@string/menu_show_incoming_only" - android:showAsAction="never" - android:orderInCategory="1"/> - - <item android:id="@+id/delete_all" android:title="@string/recentCalls_deleteAll" diff --git a/res/menu/call_log_options_new.xml b/res/menu/call_log_options_new.xml deleted file mode 100644 index 50b1cad5b..000000000 --- a/res/menu/call_log_options_new.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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/delete_all" - android:title="@string/recentCalls_deleteAll" - android:showAsAction="never" - android:orderInCategory="1"/> -</menu> diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml index 6dda8fc9a..0727dd57c 100644 --- a/res/menu/dialpad_options.xml +++ b/res/menu/dialpad_options.xml @@ -24,16 +24,9 @@ android:title="@string/add_2sec_pause" android:showAsAction="withText" android:orderInCategory="1" /> - <item android:id="@+id/menu_add_wait" android:title="@string/add_wait" android:showAsAction="withText" android:orderInCategory="1" /> - - <item - android:id="@+id/menu_call_settings_dialpad" - android:title="@string/call_settings" - android:showAsAction="withText" - android:orderInCategory="1" /> </menu> diff --git a/res/menu/dialpad_options_new.xml b/res/menu/dialpad_options_new.xml deleted file mode 100644 index 0727dd57c..000000000 --- a/res/menu/dialpad_options_new.xml +++ /dev/null @@ -1,32 +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_add_contacts" - android:title="@string/recentCalls_addToContact" - android:showAsAction="withText" - android:orderInCategory="1" /> - <item - android:id="@+id/menu_2s_pause" - android:title="@string/add_2sec_pause" - android:showAsAction="withText" - android:orderInCategory="1" /> - <item - android:id="@+id/menu_add_wait" - android:title="@string/add_wait" - android:showAsAction="withText" - android:orderInCategory="1" /> -</menu> diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index 8eaa91552..b30697956 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -15,38 +15,16 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/search_on_action_bar" - android:title="@string/menu_search" - android:icon="@drawable/ic_dial_action_search" - android:showAsAction="ifRoom" /> - - <!-- This should come after the other menus in CallLog and Dialpad --> - <item - android:id="@+id/menu_call_settings" - android:title="@string/call_settings" - android:showAsAction="withText" - android:orderInCategory="2" /> - + android:id="@+id/menu_import_export" + android:title="@string/menu_import_export" /> <item - android:id="@+id/filter_option" - android:title="@string/menu_contacts_filter" - android:showAsAction="withText" /> - + android:id="@+id/menu_clear_frequents" + android:title="@string/menu_clear_frequents" /> <item android:id="@+id/add_contact" - android:icon="@drawable/ic_add_contact_holo_dark" - android:title="@string/menu_newContact" - android:showAsAction="ifRoom" /> - - <!-- Ugly hack: empty item never clickable. - This is for forcing search icon on left even when there's a single item - in the bottom ActionBar. - We intentionally don't use android:icon to avoid other issues around item with - a null icon. - - TODO: look for better idea. --> + android:title="@string/menu_newContact"/> <item - android:id="@+id/empty_right_menu_item" - android:actionLayout="@layout/empty2" - android:showAsAction="ifRoom" /> + android:id="@+id/menu_call_settings" + android:title="@string/call_settings" + android:orderInCategory="2" /> </menu> diff --git a/res/menu/dialtacts_options_new.xml b/res/menu/dialtacts_options_new.xml deleted file mode 100644 index b30697956..000000000 --- a/res/menu/dialtacts_options_new.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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/add_contact" - android:title="@string/menu_newContact"/> - <item - android:id="@+id/menu_call_settings" - android:title="@string/call_settings" - android:orderInCategory="2" /> -</menu> |