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

7
src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.text.TextUtils;
import android.text.format.DateFormat;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.core.PreferenceControllerMixin;
@@ -52,10 +51,10 @@ public class AutoTimeFormatPreferenceController extends AbstractPreferenceContro
@Override
public void updateState(Preference preference) {
if (!(preference instanceof SwitchPreference)) {
if (!(preference instanceof TwoStatePreference)) {
return;
}
((SwitchPreference) preference).setChecked(isAutoTimeFormatSelection(mContext));
((TwoStatePreference) preference).setChecked(isAutoTimeFormatSelection(mContext));
}
@Override
@@ -64,7 +63,7 @@ public class AutoTimeFormatPreferenceController extends AbstractPreferenceContro
|| !TextUtils.equals(KEY_AUTO_24_HOUR, preference.getKey())) {
return false;
}
boolean auto24HourEnabled = ((SwitchPreference) preference).isChecked();
boolean auto24HourEnabled = ((TwoStatePreference) preference).isChecked();
Boolean is24Hour;
if (auto24HourEnabled) {
is24Hour = null;

6
src/com/android/settings/datetime/AutoTimePreferenceController.java
View File

@@ -28,7 +28,7 @@ import android.app.time.TimeManager;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
@@ -77,11 +77,11 @@ public class AutoTimePreferenceController extends AbstractPreferenceController
@Override
public void updateState(Preference preference) {
if (!(preference instanceof SwitchPreference)) {
if (!(preference instanceof TwoStatePreference)) {
return;
}
((SwitchPreference) preference).setChecked(isEnabled());
((TwoStatePreference) preference).setChecked(isEnabled());
}
@Override

6
src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
View File

@@ -29,7 +29,7 @@ import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
@@ -92,11 +92,11 @@ public class AutoTimeZonePreferenceController extends AbstractPreferenceControll
@Override
public void updateState(Preference preference) {
if (!(preference instanceof SwitchPreference)) {
if (!(preference instanceof TwoStatePreference)) {
return;
}
((SwitchPreference) preference).setChecked(isEnabled());
((TwoStatePreference) preference).setChecked(isEnabled());
}
@Override

3
src/com/android/settings/datetime/TimeFormatPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.text.TextUtils;
import android.text.format.DateFormat;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.core.PreferenceControllerMixin;
@@ -82,7 +81,7 @@ public class TimeFormatPreferenceController extends AbstractPreferenceController
|| !TextUtils.equals(KEY_TIME_FORMAT, preference.getKey())) {
return false;
}
final boolean is24Hour = ((SwitchPreference) preference).isChecked();
final boolean is24Hour = ((TwoStatePreference) preference).isChecked();
update24HourFormat(mContext, is24Hour);
mUpdateTimeAndDateCallback.updateTimeAndDateDisplay(mContext);
return true;