Snap for 4632767 from 8e45e66befc7ad38b7762e7481a8df518780b490 to pi-release
Change-Id: I28576343efbb657d69944dcb952e4f2007addd6b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 921bbbc..1476e89 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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"
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b6d496e..06dca7a 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -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>
@@ -305,7 +305,7 @@
<string name="sms_assistant" msgid="2773424339923116234">"Pošalji tekstualnu poruku <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="4069352461380762677">"Pošalji tekstualnu poruku na MMS broj"</string>
<string name="sms_by_shortcut" msgid="7741770672976099517">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Poruka)"</string>
- <string name="description_video_call" msgid="7120921378651700947">"Uputi videopoziv"</string>
+ <string name="description_video_call" msgid="7120921378651700947">"Uputi video poziv"</string>
<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"Obrisati često kontaktirane osobe?"</string>
<string name="clearFrequentsConfirmation" msgid="2270554975938265734">"Obrisat ćete listu često kontaktiranih osoba u aplikaciji Kontakti i Aplikaciji za telefon, pa će aplikacije za e-poštu morati ispočetka učiti vaše postavke adresa."</string>
<string name="clearFrequentsProgress_title" msgid="5157001637482794212">"Brisanje često kontaktiranih osoba…"</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>
@@ -502,7 +502,7 @@
<string name="url_open_error_toast" msgid="452592089815420457">"Otvaranje URL-a nije uspjelo."</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> je označen"</string>
<string name="account_filter_view_not_checked" msgid="2248684521205038389">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> nije označen"</string>
- <string name="description_search_video_call" msgid="5841525580339803272">"Uputi videopoziv"</string>
+ <string name="description_search_video_call" msgid="5841525580339803272">"Uputi video poziv"</string>
<string name="description_delete_contact" msgid="53835657343783663">"Izbriši"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Elipsa"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a9c1603..f0b10f3 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a9c1603..f0b10f3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -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>
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 9b0c896..425ee7e 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -163,6 +163,12 @@
// 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()
diff --git a/src/com/android/contacts/list/PinnedHeaderListView.java b/src/com/android/contacts/list/PinnedHeaderListView.java
index 01895c7..e178664 100644
--- a/src/com/android/contacts/list/PinnedHeaderListView.java
+++ b/src/com/android/contacts/list/PinnedHeaderListView.java
@@ -572,7 +572,7 @@
canvas.translate(translateX, header.y);
if (header.state == FADING) {
mBounds.set(0, 0, view.getWidth(), view.getHeight());
- canvas.saveLayerAlpha(mBounds, header.alpha, Canvas.ALL_SAVE_FLAG);
+ canvas.saveLayerAlpha(mBounds, header.alpha);
}
view.draw(canvas);
canvas.restoreToCount(saveCount);