commit ed71e215415f20d3574e45750a53970e86c2a9f9
author Fan Zhang <zhfan@google.com> Fri Sep 08 22:04:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 08 22:04:52 2017 +0000
tree 5c5dd63da8ef6672669a5cb3301db3a3cacdce06
parent df0e716b432c01a66690c62ac11ae0774f2de475
parent 90f9398f4e0f008717006bd4a3a30c925b49348b

Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
am: 90f9398f4e

Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae

src/com/android/settings/dashboard/DashboardFragment.java

diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index e8970ec..8c3ac0d 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -230,6 +230,9 @@
 
     @VisibleForTesting
     boolean tintTileIcon(Tile tile) {
+        if (tile.icon == null) {
+            return false;
+        }
         // First check if the tile has set the icon tintable metadata.
         final Bundle metadata = tile.metaData;
         if (metadata != null

tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java

diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 2687714..ea160dd 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -27,6 +27,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
@@ -158,6 +159,7 @@
     @Test
     public void tintTileIcon_hasMetadata_shouldReturnIconTintableMetadata() {
         final Tile tile = new Tile();
+        tile.icon = mock(Icon.class);
         final Bundle metaData = new Bundle();
         tile.metaData = metaData;
 
@@ -168,10 +170,19 @@
         assertThat(mTestFragment.tintTileIcon(tile)).isTrue();
     }
 
+    @Test
+    public void tintTileIcon_noIcon_shouldReturnFalse() {
+        final Tile tile = new Tile();
+        final Bundle metaData = new Bundle();
+        tile.metaData = metaData;
+
+        assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
+    }
 
     @Test
     public void tintTileIcon_noMetadata_shouldReturnPackageNameCheck() {
         final Tile tile = new Tile();
+        tile.icon = mock(Icon.class);
         final Intent intent = new Intent();
         tile.intent = intent;