Don't color service icons if they are not bluetooth.

BUG=32834694 Change-Id: Ied2247b10f94d46e6f5db5bc27c6072497852e32
googlearchive · Nov 11, 2016 · ec6f52a · ec6f52a
1 parent fc5af1d
commit ec6f52a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...com/google/android/apps/forscience/whistlepunk/devicemanager/ServiceParentViewHolder.java b/...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/...ienceJournal/whistlepunk_library/src/main/res/layout/service_expandable_recycler_item.xml b/...ienceJournal/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"
         />