Merge "Using the correct colors for tint from the theme. The color here comes... (6d7b93f7) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/res/values/colors_car.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,4 @@
		<color name="car_user_switcher_add_user_background_color">@color/car_dark_blue_grey_600</color>
		<color name="car_user_switcher_add_user_add_sign_color">@color/car_body1_light</color>

		<!-- colors for volume dialog tint -->
		<color name="car_volume_dialog_tint">@color/car_tint</color>
		</resources>

packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -554,8 +554,7 @@ public class CarVolumeDialogImpl implements VolumeDialog {
		// Adding the items which are not coming from the default item.
		VolumeItem volumeItem = mAvailableVolumeItems.get(groupId);
		if (volumeItem.defaultItem) {
		// Set progress here due to the progress of seekbar may not be updated.
		volumeItem.listItem.setProgress(volumeItem.progress);
		updateDefaultVolumeItem(volumeItem.listItem);
		} else {
		addSeekbarListItem(volumeItem, groupId, 0, null);
		}
		@@ -572,8 +571,7 @@ public class CarVolumeDialogImpl implements VolumeDialog {
		if (!volumeItem.defaultItem) {
		itr.remove();
		} else {
		// Set progress here due to the progress of seekbar may not be updated.
		seekbarListItem.setProgress(volumeItem.progress);
		updateDefaultVolumeItem(seekbarListItem);
		}
		}
		inAnimator = AnimatorInflater.loadAnimator(
		@@ -595,6 +593,21 @@ public class CarVolumeDialogImpl implements VolumeDialog {
		mPagedListAdapter.notifyDataSetChanged();
		}

		private void updateDefaultVolumeItem(SeekbarListItem seekbarListItem){
		VolumeItem volumeItem = findVolumeItem(seekbarListItem);

		// When volume dialog is expanded or collapsed the default list item is never
		// reset. Whereas all other list items are removed when the dialog is collapsed and then
		// added when the dialog is expanded using {@link CarVolumeDialogImpl#addSeekbarListItem}.
		// This sets the progressbar and the tint color of icons for all items other than default
		// if they were changed. For default list item it should be done manually here.
		int color = mContext.getResources().getColor(R.color.car_volume_dialog_tint);
		Drawable primaryIcon = mContext.getResources().getDrawable(volumeItem.icon);
		primaryIcon.mutate().setTint(color);
		volumeItem.listItem.setPrimaryActionIcon(primaryIcon);
		volumeItem.listItem.setProgress(volumeItem.progress);
		}

		private final class VolumeSeekBarChangeListener implements OnSeekBarChangeListener {

		private final int mVolumeGroupId;