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

Migrate new() to SwitchPreferenceCompat

Browse Source 
Bug: 306658427
Test: manual - on Settings pages
Change-Id: I258a8c63d5c46403c6d333a9d2f34c33cb35e27f
This commit is contained in:
Chaohui Wang
2023-10-24 11:38:26 +08:00
parent 5036a9cb17
commit cfdb3b1f1b
19 changed files with 93 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
View File

@@ -40,7 +40,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
@@ -157,8 +158,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem
return pref;
}
private SwitchPreference createButtonPressPreference() {
SwitchPreference pref = new SwitchPreference(mContext);
private TwoStatePreference createButtonPressPreference() {
TwoStatePreference pref = new SwitchPreferenceCompat(mContext);
pref.setKey(KEY_IGNORE_BUTTON);
pref.setTitle(mContext.getString(R.string.stylus_ignore_button));
pref.setIcon(R.drawable.ic_block);
@@ -198,7 +199,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
case KEY_IGNORE_BUTTON:
Settings.Secure.putInt(mContext.getContentResolver(),
Secure.STYLUS_BUTTONS_ENABLED,
((SwitchPreference) preference).isChecked() ? 0 : 1);
((TwoStatePreference) preference).isChecked() ? 0 : 1);
break;
}
return true;

7
src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
View File

@@ -26,7 +26,8 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -39,7 +40,7 @@ public class UsbDetailsPowerRoleController extends UsbDetailsController
private static final String KEY_USB_USE_POWER_ONLY = "usb_use_power_only";
private PreferenceCategory mPreferenceCategory;
private SwitchPreference mSwitchPreference;
private TwoStatePreference mSwitchPreference;
private int mNextPowerRole;
@@ -60,7 +61,7 @@ public class UsbDetailsPowerRoleController extends UsbDetailsController
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreferenceCategory = screen.findPreference(getPreferenceKey());
mSwitchPreference = new SwitchPreference(mPreferenceCategory.getContext());
mSwitchPreference = new SwitchPreferenceCompat(mPreferenceCategory.getContext());
mSwitchPreference.setTitle(R.string.usb_use_power_only);
mSwitchPreference.setKey(KEY_USB_USE_POWER_ONLY);
mSwitchPreference.setOnPreferenceClickListener(this);

7
src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
View File

@@ -25,7 +25,8 @@ import android.os.SystemProperties;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.SwitchPreferenceCompat;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -41,7 +42,7 @@ public class UsbDetailsTranscodeMtpController extends UsbDetailsController
private static final String KEY_USB_TRANSCODE_FILES = "usb_transcode_files";
private PreferenceCategory mPreferenceCategory;
private SwitchPreference mSwitchPreference;
private TwoStatePreference mSwitchPreference;
public UsbDetailsTranscodeMtpController(Context context, UsbDetailsFragment fragment,
UsbBackend backend) {
@@ -53,7 +54,7 @@ public class UsbDetailsTranscodeMtpController extends UsbDetailsController
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreferenceCategory = screen.findPreference(getPreferenceKey());
mSwitchPreference = new SwitchPreference(mPreferenceCategory.getContext());
mSwitchPreference = new SwitchPreferenceCompat(mPreferenceCategory.getContext());
mSwitchPreference.setTitle(R.string.usb_transcode_files);
mSwitchPreference.setKey(KEY_USB_TRANSCODE_FILES);
mSwitchPreference.setOnPreferenceClickListener(this);