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

Commit ad31a388 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Show "Settings" instead of "Display options""

parents edb695b2 ca657d2f

res/menu-sw580dp-w720dp/actions.xml

+7 −8
Original line number Diff line number Diff line
@@ -38,22 +38,21 @@ 
        android:orderInCategory="1"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="2"

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



    <item

        android:id="@+id/menu_import_export"

        android:icon="@drawable/ic_menu_import_export_holo_light"

        android:orderInCategory="3"

        android:orderInCategory="2"

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



    <item

        android:id="@+id/menu_accounts"

        android:icon="@drawable/ic_menu_accounts_holo_light"

        android:orderInCategory="4"

        android:orderInCategory="3"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="4"

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

</menu>

res/menu-sw580dp/actions.xml

+7 −8
Original line number Diff line number Diff line
@@ -41,22 +41,21 @@ 
        android:orderInCategory="1"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="2"

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



    <item

        android:id="@+id/menu_import_export"

        android:icon="@drawable/ic_menu_import_export_holo_light"

        android:orderInCategory="3"

        android:orderInCategory="2"

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



    <item

        android:id="@+id/menu_accounts"

        android:icon="@drawable/ic_menu_accounts_holo_light"

        android:orderInCategory="4"

        android:orderInCategory="3"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

        android:orderInCategory="4"

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

</menu>

res/menu/actions.xml

+4 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 
        android:icon="@drawable/ic_menu_settings_holo_light"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

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



    <item

        android:id="@+id/menu_import_export"

        android:icon="@drawable/ic_menu_import_export_holo_light"
@@ -52,4 +47,8 @@ 
        android:icon="@drawable/ic_menu_accounts_holo_light"

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



    <item

        android:id="@+id/menu_settings"

        android:icon="@drawable/ic_menu_settings_holo_light"

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

</menu>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ 
    <string name="activity_title_contacts_filter">Contacts to display</string>



    <!-- Menu item for the settings activity [CHAR LIMIT=64] -->

    <string name="menu_settings">Display options</string>

    <string name="menu_settings" msgid="377929915873428211">Settings</string>



    <!-- The preference section title for contact display options [CHAR LIMIT=128] -->

    <string name="preference_displayOptions">Display options</string>