Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6259129d authored by Shahriyar Amini's avatar Shahriyar Amini
Browse files

Use preference key specified in injected settings. 

Bug: 31002801
Test: make RunSettingsRoboTests

Reads in optional metadata field for specifying the key used for an
injected preference.

Change-Id: Ief2ff10c508d42f91906b531cf34906c1c42fdd4
parent 2e0b6084

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

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
        if (tile == null || tile.intent == null) {

            return null;

        }

        if (!TextUtils.isEmpty(tile.key)) {

            return tile.key;

        }

        final StringBuilder sb = new StringBuilder(DASHBOARD_TILE_PREF_KEY_PREFIX);

        final ComponentName component = tile.intent.getComponent();

        sb.append(component.getClassName());

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

+14 −0
Original line number Diff line number Diff line
@@ -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;