Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23851c19 authored Dec 06, 2025 by Bruno Martins

SystemUI: tuner: Migrate to PreferenceFragmentCompat

Change-Id: I15fe232595bf4842ed6dc5d13ed303d19a6eed2c

parent f3dd67b5

packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,7 @@ import android.content.Intent;
	import android.os.Bundle;		import android.os.Bundle;

	import androidx.preference.Preference;		import androidx.preference.Preference;
	import androidx.preference.Preference.OnPreferenceChangeListener;		import androidx.preference.PreferenceFragmentCompat;
	import androidx.preference.PreferenceFragment;
	import androidx.preference.PreferenceScreen;		import androidx.preference.PreferenceScreen;
	import androidx.preference.SwitchPreferenceCompat;		import androidx.preference.SwitchPreferenceCompat;

	@@ -34,7 +33,8 @@ import com.android.systemui.demomode.DemoModeController;
	import com.android.systemui.res.R;		import com.android.systemui.res.R;
	import com.android.systemui.util.settings.GlobalSettings;		import com.android.systemui.util.settings.GlobalSettings;

	public class DemoModeFragment extends PreferenceFragment implements OnPreferenceChangeListener {		public class DemoModeFragment extends PreferenceFragmentCompat
			implements Preference.OnPreferenceChangeListener {

	private static final String[] STATUS_ICONS = {		private static final String[] STATUS_ICONS = {
	"volume",		"volume",

packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ import android.widget.ImageView;
	import android.widget.TextView;		import android.widget.TextView;

	import androidx.preference.Preference;		import androidx.preference.Preference;
	import androidx.preference.PreferenceFragment;		import androidx.preference.PreferenceFragmentCompat;
	import androidx.preference.SwitchPreferenceCompat;		import androidx.preference.SwitchPreferenceCompat;
	import androidx.recyclerview.widget.LinearLayoutManager;		import androidx.recyclerview.widget.LinearLayoutManager;
	import androidx.recyclerview.widget.RecyclerView;		import androidx.recyclerview.widget.RecyclerView;
	@@ -55,7 +55,7 @@ import java.util.ArrayList;
	import java.util.Map;		import java.util.Map;
	import java.util.function.Consumer;		import java.util.function.Consumer;

	public class LockscreenFragment extends PreferenceFragment {		public class LockscreenFragment extends PreferenceFragmentCompat {

	private static final String KEY_LEFT = "left";		private static final String KEY_LEFT = "left";
	private static final String KEY_RIGHT = "right";		private static final String KEY_RIGHT = "right";
	@@ -78,7 +78,7 @@ public class LockscreenFragment extends PreferenceFragment {
	public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {		public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
	mTunerService = Dependency.get(TunerService.class);		mTunerService = Dependency.get(TunerService.class);
	mHandler = new Handler();		mHandler = new Handler();
	addPreferencesFromResource(R.xml.lockscreen_settings);		setPreferencesFromResource(R.xml.lockscreen_settings, rootKey);
	setupGroup(LOCKSCREEN_LEFT_BUTTON, LOCKSCREEN_LEFT_UNLOCK);		setupGroup(LOCKSCREEN_LEFT_BUTTON, LOCKSCREEN_LEFT_UNLOCK);
	setupGroup(LOCKSCREEN_RIGHT_BUTTON, LOCKSCREEN_RIGHT_UNLOCK);		setupGroup(LOCKSCREEN_RIGHT_BUTTON, LOCKSCREEN_RIGHT_UNLOCK);
	}		}

packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,7 @@ public class NavBarTuner extends TunerPreferenceFragment {

	@Override		@Override
	public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {		public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
	addPreferencesFromResource(R.xml.nav_bar_tuner);		setPreferencesFromResource(R.xml.nav_bar_tuner, rootKey);
	bindLayout((ListPreference) findPreference(LAYOUT));		bindLayout((ListPreference) findPreference(LAYOUT));
	bindButton(NAV_BAR_LEFT, NAVSPACE, LEFT);		bindButton(NAV_BAR_LEFT, NAVSPACE, LEFT);
	bindButton(NAV_BAR_RIGHT, MENU_IME_ROTATE, RIGHT);		bindButton(NAV_BAR_RIGHT, MENU_IME_ROTATE, RIGHT);

packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ import android.util.ArrayMap;
	import android.util.ArraySet;		import android.util.ArraySet;
	import android.view.View;		import android.view.View;

	import androidx.preference.PreferenceFragment;		import androidx.preference.PreferenceFragmentCompat;
	import androidx.preference.PreferenceScreen;		import androidx.preference.PreferenceScreen;
	import androidx.preference.PreferenceViewHolder;		import androidx.preference.PreferenceViewHolder;
	import androidx.preference.SwitchPreferenceCompat;		import androidx.preference.SwitchPreferenceCompat;
	@@ -46,7 +46,7 @@ import com.android.systemui.shared.plugins.PluginPrefs;
	import java.util.List;		import java.util.List;
	import java.util.Set;		import java.util.Set;

	public class PluginFragment extends PreferenceFragment {		public class PluginFragment extends PreferenceFragmentCompat {

	public static final String ACTION_PLUGIN_SETTINGS		public static final String ACTION_PLUGIN_SETTINGS
	= "com.android.systemui.action.PLUGIN_SETTINGS";		= "com.android.systemui.action.PLUGIN_SETTINGS";

packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ import android.os.Process;

	import androidx.preference.Preference;		import androidx.preference.Preference;
	import androidx.preference.PreferenceCategory;		import androidx.preference.PreferenceCategory;
	import androidx.preference.PreferenceFragment;		import androidx.preference.PreferenceFragmentCompat;
	import androidx.preference.PreferenceScreen;		import androidx.preference.PreferenceScreen;
	import androidx.preference.PreferenceViewHolder;		import androidx.preference.PreferenceViewHolder;

	@@ -37,7 +37,7 @@ import com.android.systemui.tuner.TunerService.Tunable;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;

	public class ShortcutPicker extends PreferenceFragment implements Tunable {		public class ShortcutPicker extends PreferenceFragmentCompat implements Tunable {

	private final ArrayList<SelectablePreference> mSelectablePreferences = new ArrayList<>();		private final ArrayList<SelectablePreference> mSelectablePreferences = new ArrayList<>();
	private String mKey;		private String mKey;