Merge "Update icon for security settings." into pi-dev am: 3e3b496738

am: 59c8620745 Change-Id: I44c9c526b1e77107bd69ace16ecd9779ab25b73f
2018-04-17 16:30:26 -07:00
parent 8095cfcf72 59c8620745
commit db2255b000
10 changed files with 34 additions and 81 deletions
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -297,7 +297,7 @@ public class DashboardFeatureProviderImplTest {
                "content://com.android.settings/tile_icon");
        mImpl.bindIcon(preference, tile);

-        assertThat(tile.icon).isNotNull();
+        assertThat(preference.getIcon()).isNotNull();
    }

    @Test