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

[Catalyst] Support RadioButtonPickerFragment

Browse Source 
Bug: 368359967
Flag: com.android.settings.flags.catalyst_screen_timeout
Test: manual
Change-Id: Ibd3a1c52b152054bf01e37848785c5bda588df5f
This commit is contained in:
Jacky Wang
2024-11-16 03:22:58 +08:00
parent e6ef4c2443
commit 3a20528ae4
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,11 +308,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
super.onDestroy();
}
@Override
protected final int getPreferenceScreenResId(@NonNull Context context) {
return getPreferenceScreenResId();
}
@Override
protected abstract int getPreferenceScreenResId();
@@ -413,7 +408,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
removeControllersForHybridMode();
}
setPreferenceScreen(screen);
requireActivity().setTitle(screen.getTitle());
updateActivityTitleWithScreenTitle(screen);
} else {
addPreferencesFromResource(resId);
screen = getPreferenceScreen();
@@ -447,19 +442,6 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
}
}
/** Returns if catalyst is enabled on current screen. */
protected final boolean isCatalystEnabled() {
return getPreferenceScreenCreator() != null;
}
private @Nullable PreferenceScreenCreator getPreferenceScreenCreator() {
if (!Flags.catalyst()) {
return null;
}
Context context = getContext();
return context != null ? getPreferenceScreenCreator(context) : null;
}
/**
* Perform {@link AbstractPreferenceController#displayPreference(PreferenceScreen)}
* on all {@link AbstractPreferenceController}s.