From 7b76d2a8420621edf87e634ff454525d58fed33b Mon Sep 17 00:00:00 2001 From: AnierinB Date: Mon, 27 Jan 2025 20:36:56 +0000 Subject: [PATCH] Settings: Set key order on addition When the activity is created, injected preferences were not setting their order. This could potentially lead to two bottom preferences in a given category on rebind. Ensure the order is set during key addition to prevent such issues. Follow up to change: I1dc0148c5595f20daf026970d6514e63776b0499 Change-Id: I9df0bafbc2d2eddde94f07104d803fdc46adec8c Signed-off-by: AnierinB --- src/com/android/settings/dashboard/DashboardFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index ba99fa9af4d..d825f0cb84f 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -648,6 +648,10 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment observers = mDashboardFeatureProvider.bindPreferenceToTileAndGetObservers( getActivity(), this, forceRoundedIcons, pref, tile, key, mPlaceholderPreferenceController.getOrder()); + // Order the prefs within their respective category + if (KEY_ORDER.containsKey(key)) { + pref.setOrder(KEY_ORDER.get(key)); + } if (Flags.dynamicInjectionCategory()) { if (tile.hasGroupKey()) { Preference group = screen.findPreference(tile.getGroupKey());