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

Commit b7b9508f authored by Maurice Chu's avatar Maurice Chu Committed by Android (Google) Code Review
Browse files

Merge "Added help menu options to People app" into jb-dev

parents ac71b530 692d4636

res/menu-sw580dp-w720dp/people_options.xml

+8 −2
Original line number Diff line number Diff line
@@ -44,15 +44,21 @@ 


    <item

        android:id="@+id/menu_clear_frequents"

        android:orderInCategory="3"

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



    <item

        android:id="@+id/menu_accounts"

        android:orderInCategory="3"

        android:orderInCategory="4"

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



    <item

        android:id="@+id/menu_settings"

        android:orderInCategory="4"

        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/people_options.xml

+8 −2
Original line number Diff line number Diff line
@@ -47,15 +47,21 @@ 


    <item

        android:id="@+id/menu_clear_frequents"

        android:orderInCategory="3"

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



    <item

        android:id="@+id/menu_accounts"

        android:orderInCategory="3"

        android:orderInCategory="4"

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



    <item

        android:id="@+id/menu_settings"

        android:orderInCategory="4"

        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/edit_contact.xml

+4 −0
Original line number Diff line number Diff line
@@ -32,4 +32,8 @@ 
        android:id="@+id/menu_discard"

        android:alphabeticShortcut="q"

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



    <item

        android:id="@+id/menu_help"

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

</menu>

res/menu/people_options.xml

+4 −0
Original line number Diff line number Diff line
@@ -51,4 +51,8 @@ 
    <item

        android:id="@+id/menu_settings"

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



    <item

        android:id="@+id/menu_help"

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

</menu>

res/values/donottranslate_config.xml

+13 −0
Original line number Diff line number Diff line
@@ -130,4 +130,17 @@ 
         Setting this flag to false in a resource overlay allows you to

         entirely disable SIM import on a per-product basis. -->

    <bool name="config_allow_sim_import">true</bool>





    <!-- Help URL pointing to main TOC for People. This is intentionally empty because

         the overlay will fill this in during build time. -->

    <string name="help_url_people_main"></string>



    <!-- Help URL pointing to adding contacts in People. This is intentionally empty because

         the overlay will fill this in during build time. -->

    <string name="help_url_people_add"></string>



    <!-- Help URL pointing to editing contacts in People. This is intentionally empty because

         the overlay will fill this in during build time. -->

    <string name="help_url_people_edit"></string>

</resources>