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

Commit 091925b0 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0 

Conflicts:
	res/values-fr/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-zh-rHK/cm_strings.xml

Change-Id: I27ea076f35af5bbe1c74907e6ccea23fffb7c8cd
parents 11184aad dbd31fc0

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


    <original-package android:name="com.android.contacts" />



    <uses-permission android:name="android.permission.CALL_PHONE" />

    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

res/menu-sw600dp/people_options.xml

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
        android:title="@string/menu_new_group_action_bar"

        android:showAsAction="ifRoom" />



    <item

        android:id="@+id/menu_multi_delete"

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



    <!-- 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
@@ -67,6 +71,10 @@ 
        android:orderInCategory="5"

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



    <item

        android:id="@+id/menu_memory_status"

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



    <item

        android:id="@+id/menu_help"

        android:orderInCategory="6"

res/menu-sw600dp/view_contact.xml

+25 −1
Original line number Diff line number Diff line
@@ -31,8 +31,32 @@ 
        android:id="@+id/menu_delete"

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



    <item

        android:id="@+id/menu_set_ringtone"

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



    <item

        android:id="@+id/menu_copy_to_phone"

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



    <item

        android:id="@+id/menu_copy_to_sim1"

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



    <item

        android:id="@+id/menu_copy_to_sim2"

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



    <item

        android:id="@+id/menu_send_via_sms"

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



    <item

        android:id="@+id/menu_send_to_voicemail"

        android:checkable="true"

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



    <item

        android:id="@+id/menu_create_contact_shortcut"

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



</menu>

res/menu/people_options.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
        android:showAsAction="ifRoom" />



    <item

        android:id="@+id/menu_delete"

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

        android:id="@+id/menu_multi_delete"

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



    <item

        android:id="@+id/menu_contacts_filter"

res/values-ca/cm_strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
  <string name="quick_contact_copied_toast">"Copiat al portapapers"</string>

  <string name="deleteConfirmation_title">Vols esborrar el contacte?</string>

  <string name="importConfirmation_title">Vols importar el contacte?</string>

  <string name="menu_deleteContacts">Esborra contactes</string>

  <string name="contactDeletedToast">Contacte esborrat</string>

  <string name="contactSavedToSimCardError">No s\'han pogut desar els contactes seleccionats a la targeta SIM</string>

  <string name="airplane_mode_on">No es pot accedir a la targeta SIM mentre el mode avió està activat</string>