Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Using the correct colors for tint from the theme. The color here comes from car_product overlay for night values."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-09 04:07:33 +00:00
committed by Android (Google) Code Review
parent 4298222661 d3d76379f4
commit 6d7b93f75f
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CarSystemUI/res/values/colors_car.xml
View File

@@ -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>

21
packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
View File

@@ -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;