Merge "Check permissions before creating dynamic shortcuts." into ub-contactsdialer-g-dev
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 39b47b7..b210557 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -184,7 +184,7 @@
<string name="upgrade_in_progress" msgid="474511436863451061">"Kontakt ro‘yxati yangilanmoqda."</string>
<string name="search_results_searching" msgid="3984833028938569930">"Qidirilmoqda…"</string>
<string name="menu_display_selected" msgid="6470001164297969034">"Tanlanganni ko‘rsatish"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Barchasini ko‘rsatish"</string>
+ <string name="menu_display_all" msgid="8887488642609786198">"Hammasini ko‘rsatish"</string>
<string name="menu_select_all" msgid="621719255150713545">"Hammasini belgilash"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Barcha tanlashlarni bekor qilish"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Yangisini qo‘shish"</string>
diff --git a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java b/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
index d1ae911..11d19c0 100644
--- a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
+++ b/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
@@ -115,8 +115,15 @@
}
private Cursor loadFavoritesContacts() {
+ final StringBuilder selection = new StringBuilder();
+ selection.append(Contacts.STARRED + "=?");
+ final ContactListFilter filter =
+ ContactListFilterController.getInstance(getContext()).getFilter();
+ if (filter != null && filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) {
+ selection.append(" AND ").append(Contacts.IN_VISIBLE_GROUP + "=1");
+ }
return getContext().getContentResolver().query(
- Contacts.CONTENT_URI, mProjection, Contacts.STARRED + "=?", new String[]{"1"},
+ Contacts.CONTENT_URI, mProjection, selection.toString(), new String[]{"1"},
getSortOrder());
}
}