diff --git a/res/values/config.xml b/res/values/config.xml index d37db441ea4..21d9c7528d1 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -495,12 +495,6 @@ - - - - - - false diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index b404ecccdc7..5a686c26a06 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -185,9 +185,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { pref.setOrder(order + baseOrder); } } - - overrideTilePosition(tile, pref); - return outObservers.isEmpty() ? null : outObservers; } @@ -457,25 +454,4 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { } return eligibleUsers; } - - private void overrideTilePosition(Tile tile, Preference pref) { - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME) - && TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) { - final String[] homepageTilePackages = mContext.getResources().getStringArray( - R.array.config_homepage_tile_packages); - final int[] homepageTileOrders = mContext.getResources().getIntArray( - R.array.config_homepage_tile_orders); - if (homepageTilePackages.length == 0 - || homepageTilePackages.length != homepageTileOrders.length) { - return; - } - - for (int i = 0; i < homepageTilePackages.length; i++) { - if (TextUtils.equals(tile.getPackageName(), homepageTilePackages[i])) { - pref.setOrder(homepageTileOrders[i]); - return; - } - } - } - } } diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index af02d4523dc..b1d4be9ea1c 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -100,14 +100,4 @@ content://com.android.settings.slices/test - - - - com.android.settings - - - - - 100 - diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 1fba12ba979..b2d11dc8cd0 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -672,18 +672,4 @@ public class DashboardFeatureProviderImplTest { assertThat(argument.getValue().getIdentifier()).isEqualTo(0); verify(mActivity, never()).getSupportFragmentManager(); } - - @Test - @Config(qualifiers = "mcc999") - public void bindPreference_specificHomepageTile_shouldOverridePosition() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - final Preference preference = new Preference(RuntimeEnvironment.application); - final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE); - - mImpl.bindPreferenceToTileAndGetObservers(mActivity, mForceRoundedIcon, - MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */, - Preference.DEFAULT_ORDER); - - assertThat(preference.getOrder()).isEqualTo(100); - } }