Merge "Update icon for security settings." into pi-dev

2018-04-17 22:33:26 +00:00
parent 014ed74845 f2dce9fac2
commit 3e3b496738
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