Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf199ab authored by Chiao Cheng's avatar Chiao Cheng Committed by Android (Google) Code Review
Browse files

Merge "Make portrait action bar icons consistent with landscape." into jb-dev

parents 47c9282b 70f77ea6

res/menu-sw580dp-w720dp/people_options.xml

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
<?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_holo_dark"

        android:title="@string/menu_search"

        android:showAsAction="always" />



    <item

        android:id="@+id/menu_add_contact"

        android:icon="@drawable/ic_add_contact_holo_dark"

        android:title="@string/menu_new_contact_action_bar"

        android:showAsAction="always" />



    <item

        android:id="@+id/menu_custom_add_group"

        android:icon="@drawable/ic_add_group_holo_dark"

        android:title="@string/menu_new_group_action_bar"

        android:showAsAction="always" />



    <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" />

</menu>

res/menu-sw580dp-w720dp/view_contact.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?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_dark"

        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>

res/menu-sw580dp-w720dp/view_group.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?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_dark"

        android:title="@string/menu_editGroup"

        android:alphabeticShortcut="e"

        android:showAsAction="always" />



    <item

        android:id="@+id/menu_delete_group"

        android:title="@string/menu_deleteGroup" />

</menu>

res/menu-sw580dp/people_options.xml

+4 −2
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ 
    <item

        android:id="@+id/menu_add_contact"

        android:icon="@drawable/ic_add_contact_holo_dark"

        android:title="@string/menu_new_contact_action_bar" />

        android:title="@string/menu_new_contact_action_bar"

        android:showAsAction="ifRoom" />



    <item

        android:id="@+id/menu_add_group"

        android:icon="@drawable/ic_add_group_holo_dark"

        android:title="@string/menu_new_group_action_bar" />

        android:title="@string/menu_new_group_action_bar"

        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

res/menu-sw580dp/view_contact.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
        android:id="@+id/menu_edit"

        android:icon="@drawable/ic_menu_compose_holo_dark"

        android:title="@string/menu_editContact"

        android:alphabeticShortcut="e" />

        android:alphabeticShortcut="e"

        android:showAsAction="always"/>



    <item

        android:id="@+id/menu_share"