PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526

Change-Id: Ia4880b03a5e5c200e2449144d1b7f4f386710f52
This commit is contained in:
Yanting Yang
2021-05-14 02:39:57 +00:00
committed by Automerger Merge Worker
parent d2042cf5ab 542ba7477e
commit 82e91de6ca
4 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/config.xml
View File

@@ -495,12 +495,6 @@
<!-- Authority of advanced device battery prediction -->
<string name="config_battery_prediction_authority" translatable="false"></string>
<!-- Packages for overriding tile positions on the homepage -->
<string-array name="config_homepage_tile_packages" translatable="false"/>
<!-- Orders for overriding tile positions on the homepage -->
<integer-array name="config_homepage_tile_orders"/>
<!-- Whether to handle slot change events -->
<bool name="config_handle_sim_slot_change">false</bool>

24
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -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;
}
}
}
}
}

10
tests/robotests/res/values-mcc999/config.xml
View File

@@ -100,14 +100,4 @@
<!-- Uri to query non-public Slice Uris. -->
<string name="config_non_public_slice_query_uri" translatable="false">content://com.android.settings.slices/test</string>
<!-- Packages for overriding tile positions on the homepage -->
<string-array name="config_homepage_tile_packages" translatable="false">
<item>com.android.settings</item>
</string-array>
<!-- Orders for overriding tile positions on the homepage -->
<integer-array name="config_homepage_tile_orders">
<item>100</item>
</integer-array>
</resources>

14
tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
View File

@@ -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);
}
}