Merge "Use preference key specified in injected settings."

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

@@ -144,6 +144,20 @@ public class DashboardFeatureProviderImplTest {
         assertThat(preference.getOrder()).isEqualTo(Preference.DEFAULT_ORDER);
     }
 
+    @Test
+    public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
+        final Preference preference = new Preference(
+                ShadowApplication.getInstance().getApplicationContext());
+        final Tile tile = new Tile();
+        tile.key = "key";
+        tile.intent = new Intent();
+        tile.intent.setComponent(new ComponentName("pkg", "class"));
+        mImpl.bindPreferenceToTile(mActivity, preference, tile, null /* key */
+                , Preference.DEFAULT_ORDER);
+
+        assertThat(preference.getKey()).isEqualTo(tile.key);
+    }
+
     @Test
     public void bindPreference_withBaseOrder_shouldOffsetPriority() {
         final int baseOrder = 100;