[Catalyst] Support RadioButtonPickerFragment
Bug: 368359967 Flag: com.android.settings.flags.catalyst_screen_timeout Test: manual Change-Id: Ibd3a1c52b152054bf01e37848785c5bda588df5f
This commit is contained in:
@@ -35,6 +35,8 @@ import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.annotation.XmlRes;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
@@ -54,6 +56,7 @@ import com.android.settings.widget.LoadingViewController;
|
||||
import com.android.settingslib.CustomDialogPreferenceCompat;
|
||||
import com.android.settingslib.CustomEditTextPreferenceCompat;
|
||||
import com.android.settingslib.core.instrumentation.Instrumentable;
|
||||
import com.android.settingslib.preference.PreferenceScreenCreator;
|
||||
import com.android.settingslib.search.Indexable;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
@@ -176,6 +179,24 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final int getPreferenceScreenResId(@NonNull Context context) {
|
||||
return getPreferenceScreenResId();
|
||||
}
|
||||
|
||||
/** Returns if catalyst is enabled on current screen. */
|
||||
protected final boolean isCatalystEnabled() {
|
||||
return getPreferenceScreenCreator() != null;
|
||||
}
|
||||
|
||||
protected @Nullable PreferenceScreenCreator getPreferenceScreenCreator() {
|
||||
if (!Flags.catalyst()) {
|
||||
return null;
|
||||
}
|
||||
Context context = getContext();
|
||||
return context != null ? getPreferenceScreenCreator(context) : null;
|
||||
}
|
||||
|
||||
public View setPinnedHeaderView(int layoutResId) {
|
||||
final LayoutInflater inflater = getActivity().getLayoutInflater();
|
||||
final View pinnedHeader =
|
||||
|
Reference in New Issue
Block a user