Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Catalyst] Rebind restricted preferences for SettingsPreferenceFragment

Browse Source 
Bug: 377600992
Fix: 397357248
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I4ce83d8032d9ef8730dec5efd61f9834f2433983
This commit is contained in:
Jacky Wang
2025-02-18 22:52:06 +08:00
parent 17793e3c26
commit 4ffe4464fc
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -48,13 +48,11 @@ import com.android.settings.core.CategoryMixin.CategoryListener;
import com.android.settings.core.PreferenceControllerListHelper;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.restriction.UserRestrictionBindingHelper;
import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.preference.PreferenceScreenBindingHelper;
import com.android.settingslib.preference.PreferenceScreenCreator;
import com.android.settingslib.search.Indexable;
@@ -94,8 +92,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
private boolean mListeningToCategoryChange;
private List<String> mSuppressInjectedTileKeys;
private @Nullable UserRestrictionBindingHelper mUserRestrictionBindingHelper;
@Override
public void onAttach(Context context) {
super.onAttach(context);
@@ -182,13 +178,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
// editing dialog is recreated (that would happen before onResume is called).
updatePreferenceStates();
}
if (isCatalystEnabled()) {
PreferenceScreenBindingHelper helper = getPreferenceScreenBindingHelper();
if (helper != null) {
mUserRestrictionBindingHelper = new UserRestrictionBindingHelper(requireContext(),
helper);
}
}
}
@Override
@@ -299,15 +288,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
}
}
@Override
public void onDestroy() {
if (mUserRestrictionBindingHelper != null) {
mUserRestrictionBindingHelper.close();
mUserRestrictionBindingHelper = null;
}
super.onDestroy();
}
@Override
protected abstract int getPreferenceScreenResId();