Merge "Fixed speed dial remove." (6e1516d5) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/speeddial/SpeedDialFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ public class SpeedDialFragment extends Fragment {

		@Override
		public int getDrawableId() {
		return R.drawable.context_menu_contact_icon;
		return R.drawable.quantum_ic_star_vd_theme_24;
		}

		@Override

+4 −14

Original line number	Diff line number	Diff line
		@@ -130,11 +130,8 @@ public final class SpeedDialUiItemMutator {
		private ImmutableList<SpeedDialUiItem> removeSpeedDialUiItemInternal(
		SpeedDialUiItem speedDialUiItem) {
		Assert.isWorkerThread();
		if (speedDialUiItem.isStarred()) {
		Assert.checkArgument(speedDialUiItem.isStarred());
		removeStarredSpeedDialUiItem(speedDialUiItem);
		} else {
		removeSuggestedSpeedDialUiItem(speedDialUiItem);
		}
		return loadSpeedDialUiItemsInternal();
		}

		@@ -175,19 +172,12 @@ public final class SpeedDialUiItemMutator {
		appContext
		.getContentResolver()
		.update(
		Phone.CONTENT_URI,
		Contacts.CONTENT_URI,
		contentValues,
		Phone.CONTACT_ID + " = ?",
		Contacts._ID + " = ?",
		new String[] {Long.toString(speedDialUiItem.contactId())});
		}

		@WorkerThread
		@SuppressWarnings("unused")
		private void removeSuggestedSpeedDialUiItem(SpeedDialUiItem speedDialUiItem) {
		Assert.isWorkerThread();
		// TODO(calderwoodra): remove strequent contact
		}

		/**
		* Takes a contact uri from {@link Phone#CONTENT_URI} and updates {@link Phone#STARRED} to be
		* true, if it isn't already or Inserts the contact into the {@link SpeedDialEntryDatabaseHelper}

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,5 +57,5 @@
		<string name="contact_menu_contact_info">Contact info</string>

		<!-- Text shown to the user in a button to prompt them to mark a contact as a favorite contact [CHAR LIMIT=30]. -->
		<string name="suggested_contact_bottom_sheet_add_favorite_option">Add to favorites</string>
		<string name="suggested_contact_bottom_sheet_add_favorite_option">Add favorite</string>
		</resources>
		No newline at end of file