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

Migrate to TwoStatePreference

Browse Source 
SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.

Using TwoStatePreference in Java will helps migration in the future.

Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
This commit is contained in:
Chaohui Wang
2023-10-23 12:38:18 +08:00
parent 7976f1e76d
commit 15ca95a31b
141 changed files with 391 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/nfc/ChangeNfcTagAppsStateDetails.java
View File

@@ -24,7 +24,7 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
@@ -41,7 +41,7 @@ public class ChangeNfcTagAppsStateDetails extends AppInfoWithHeader
private static final String LOG_TAG = "ChangeNfcTagAppsStateDetails";
private AppStateNfcTagAppsBridge mAppBridge;
private SwitchPreference mSwitchPref;
private TwoStatePreference mSwitchPref;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -51,7 +51,7 @@ public class ChangeNfcTagAppsStateDetails extends AppInfoWithHeader
// find preferences
addPreferencesFromResource(R.xml.change_nfc_tag_apps_details);
mSwitchPref = (SwitchPreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH);
mSwitchPref = (TwoStatePreference) findPreference(KEY_APP_OPS_SETTINGS_SWITCH);
// set title/summary for all of them
mSwitchPref.setTitle(R.string.change_nfc_tag_apps_detail_switch);

6
src/com/android/settings/nfc/SecureNfcEnabler.java
View File

@@ -20,7 +20,7 @@ import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.UserManager;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
@@ -30,10 +30,10 @@ import com.android.settings.R;
* the current state.
*/
public class SecureNfcEnabler extends BaseNfcEnabler {
private final SwitchPreference mPreference;
private final TwoStatePreference mPreference;
private final UserManager mUserManager;
public SecureNfcEnabler(Context context, SwitchPreference preference) {
public SecureNfcEnabler(Context context, TwoStatePreference preference) {
super(context);
mPreference = preference;
mUserManager = context.getSystemService(UserManager.class);

4
src/com/android/settings/nfc/SecureNfcPreferenceController.java
View File

@@ -20,7 +20,7 @@ import android.nfc.NfcAdapter;
import android.os.UserManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
@@ -49,7 +49,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
return;
}
final SwitchPreference switchPreference = screen.findPreference(getPreferenceKey());
final TwoStatePreference switchPreference = screen.findPreference(getPreferenceKey());
mSecureNfcEnabler = new SecureNfcEnabler(mContext, switchPreference);
}