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

Commit ed2f7ff3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4632767 from 8e45e66b to pi-release 

Change-Id: I28576343efbb657d69944dcb952e4f2007addd6b
parents 17c97afe 8e45e66b

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 
    <!-- Following used for getting the status of the contacts sync adapter -->

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

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

    <!-- Required in P to run Service.startForeground() -->

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



    <uses-feature

        android:name="android.hardware.telephony"

res/values-bs/strings.xml

+7 −7
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
    <string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Odaberi"</string>

    <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Izrada novog kontakta"</string>

    <string name="searchHint" msgid="8482945356247760701">"Pretraži kontakte"</string>

    <string name="menu_addStar" msgid="2908478235715404876">"Dodaj u favorite"</string>

    <string name="menu_removeStar" msgid="5844227078364227030">"Ukloni iz favorita"</string>

    <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Uklonjeno iz favorita"</string>

    <string name="description_action_menu_add_star" msgid="3327186327234177456">"Dodano u favorite"</string>

    <string name="menu_addStar" msgid="2908478235715404876">"Dodaj u omiljeno"</string>

    <string name="menu_removeStar" msgid="5844227078364227030">"Ukloni iz omiljenih"</string>

    <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Uklonjeno iz omiljenih"</string>

    <string name="description_action_menu_add_star" msgid="3327186327234177456">"Dodano u omiljeno"</string>

    <string name="menu_editContact" msgid="9042415603857662633">"Uredi"</string>

    <string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>

    <string name="menu_change_photo" msgid="7769177631511496210">"Promijeni fotografiju"</string>
@@ -478,7 +478,7 @@ 
    <string name="custom_list_filter" msgid="9048525797111024204">"Prilagodi prikaz"</string>

    <string name="menu_custom_filter_save" msgid="2679793632208086460">"Sačuvaj"</string>

    <string name="hint_findContacts" msgid="7128627979899070325">"Pretraži kontakte"</string>

    <string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriti"</string>

    <string name="contactsFavoritesLabel" msgid="8417039765586853670">"Omiljeni"</string>

    <string name="menu_import" msgid="6107961135813836467">"Uvoz"</string>

    <string name="menu_export" msgid="2658783911863503902">"Izvoz"</string>

    <string name="menu_blocked_numbers" msgid="5272951629083025995">"Blokirani brojevi"</string>

res/values-pt-rBR/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
    <string name="splitConfirmation_positive_button" msgid="9129409098807939699">"Desvincular"</string>

    <string name="splitConfirmationWithPendingChanges" msgid="7719062163511895696">"Gostaria de salvar as alterações já feitas e desvincular este contato em vários contatos?"</string>

    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"Salvar e desvincular"</string>

    <string name="joinConfirmation" msgid="8262614843581924365">"Gostaria de salvar as alterações já efetuadas e vincular com o contato selecionado?"</string>

    <string name="joinConfirmation" msgid="8262614843581924365">"Gostaria de salvar as alterações já feitas e vincular com o contato selecionado?"</string>

    <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Salvar e vincular"</string>

    <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Vinculando"</string>

    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Desvinculando"</string>
@@ -57,7 +57,7 @@ 
    <string name="menu_linkedContacts" msgid="400444389718855621">"Ver contatos vinculados"</string>

    <string name="menu_save" msgid="1727844363591825909">"Salvar"</string>

    <string name="titleJoinContactDataWith" msgid="6825255752748313944">"Vincular contatos"</string>

    <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecione o contato que você deseja vincular com <xliff:g id="NAME">%s</xliff:g>:"</string>

    <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecione o contato que você quer vincular com <xliff:g id="NAME">%s</xliff:g>:"</string>

    <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contatos sugeridos"</string>

    <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contatos"</string>

    <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"Nome vinculado: <xliff:g id="NAME">%s</xliff:g>"</string>

res/values-pt/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
    <string name="splitConfirmation_positive_button" msgid="9129409098807939699">"Desvincular"</string>

    <string name="splitConfirmationWithPendingChanges" msgid="7719062163511895696">"Gostaria de salvar as alterações já feitas e desvincular este contato em vários contatos?"</string>

    <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"Salvar e desvincular"</string>

    <string name="joinConfirmation" msgid="8262614843581924365">"Gostaria de salvar as alterações já efetuadas e vincular com o contato selecionado?"</string>

    <string name="joinConfirmation" msgid="8262614843581924365">"Gostaria de salvar as alterações já feitas e vincular com o contato selecionado?"</string>

    <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Salvar e vincular"</string>

    <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Vinculando"</string>

    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Desvinculando"</string>
@@ -57,7 +57,7 @@ 
    <string name="menu_linkedContacts" msgid="400444389718855621">"Ver contatos vinculados"</string>

    <string name="menu_save" msgid="1727844363591825909">"Salvar"</string>

    <string name="titleJoinContactDataWith" msgid="6825255752748313944">"Vincular contatos"</string>

    <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecione o contato que você deseja vincular com <xliff:g id="NAME">%s</xliff:g>:"</string>

    <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecione o contato que você quer vincular com <xliff:g id="NAME">%s</xliff:g>:"</string>

    <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contatos sugeridos"</string>

    <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contatos"</string>

    <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"Nome vinculado: <xliff:g id="NAME">%s</xliff:g>"</string>

src/com/android/contacts/list/CustomContactListFilterActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -163,6 +163,12 @@ public class CustomContactListFilterActivity extends Activity implements 
            // ContactsContract.Settings

            for (AccountInfo info : sourceAccounts) {

                final AccountWithDataSet account = info.getAccount();

                // Don't include the null account because it doesn't support writing to

                // ContactsContract.Settings

                if (account.isNullAccount()) {

                    continue;

                }



                final AccountDisplay accountDisplay = new AccountDisplay(resolver, info);



                final Uri.Builder groupsUri = Groups.CONTENT_URI.buildUpon()