From ec6f52ac5841b42d45735970bedacde2bdc11689 Mon Sep 17 00:00:00 2001 From: Katie Dektar Date: Fri, 11 Nov 2016 14:30:03 -0800 Subject: [PATCH] Don't color service icons if they are not bluetooth. BUG=32834694 Change-Id: Ied2247b10f94d46e6f5db5bc27c6072497852e32 --- .../devicemanager/ServiceParentViewHolder.java | 9 ++++++++- .../main/res/layout/service_expandable_recycler_item.xml | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/devicemanager/ServiceParentViewHolder.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/devicemanager/ServiceParentViewHolder.java index 38c6aa08..f61a4fdd 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/devicemanager/ServiceParentViewHolder.java +++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/devicemanager/ServiceParentViewHolder.java @@ -16,6 +16,7 @@ package com.google.android.apps.forscience.whistlepunk.devicemanager; import android.app.FragmentManager; +import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.view.View; import android.view.accessibility.AccessibilityEvent; @@ -25,8 +26,10 @@ import android.widget.ImageView; import android.widget.TextView; +import com.google.android.apps.forscience.whistlepunk.ColorUtils; import com.google.android.apps.forscience.whistlepunk.R; import com.google.android.apps.forscience.whistlepunk.ToggleArrow; +import com.google.android.apps.forscience.whistlepunk.metadata.BleSensorSpec; import com.google.common.base.Supplier; public class ServiceParentViewHolder extends OffsetParentViewHolder { @@ -51,7 +54,11 @@ public void bind(final ServiceParentListItem item, FragmentManager fragmentManag final Runnable onRefresh) { mItem = item; mNameView.setText(item.getServiceName()); - mIcon.setImageDrawable(item.getDeviceIcon(mIcon.getContext())); + Drawable icon = item.getDeviceIcon(mIcon.getContext()); + if (item.getProviderId().equals(BleSensorSpec.TYPE)) { + icon = ColorUtils.colorDrawable(mIcon.getContext(), icon, R.color.color_accent); + } + mIcon.setImageDrawable(icon); mCollapsedIcon.setActionStrings(R.string.btn_expand_device, R.string.btn_contract_device); mCollapsedIcon.setActive(item.isInitiallyExpanded(), false); diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/service_expandable_recycler_item.xml b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/service_expandable_recycler_item.xml index a90f84b4..49f4255e 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/service_expandable_recycler_item.xml +++ b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/service_expandable_recycler_item.xml @@ -40,7 +40,6 @@ android:layout_margin="12dp" android:scaleType="centerInside" android:importantForAccessibility="no" - android:tint="@color/color_accent" android:layout_gravity="center_vertical" />