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/wifi/ChangeWifiStateDetails.java
View File

@@ -24,7 +24,7 @@ import android.os.Bundle;
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 ChangeWifiStateDetails extends AppInfoWithHeader
private AppStateChangeWifiStateBridge mAppBridge;
private AppOpsManager mAppOpsManager;
private SwitchPreference mSwitchPref;
private TwoStatePreference mSwitchPref;
private WifiSettingsState mWifiSettingsState;
@Override
@@ -53,7 +53,7 @@ public class ChangeWifiStateDetails extends AppInfoWithHeader
// find preferences
addPreferencesFromResource(R.xml.change_wifi_state_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_wifi_state_app_detail_switch);

4
src/com/android/settings/wifi/WifiWakeupPreferenceController.java
View File

@@ -31,7 +31,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
@@ -53,7 +53,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i
private Fragment mFragment;
@VisibleForTesting
SwitchPreference mPreference;
TwoStatePreference mPreference;
@VisibleForTesting
LocationManager mLocationManager;

4
src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.net.wifi.WifiManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
@@ -56,7 +56,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration();
mSettingsOn = softApConfiguration.isAutoShutdownEnabled();
((SwitchPreference) preference).setChecked(mSettingsOn);
((TwoStatePreference) preference).setChecked(mSettingsOn);
}
@Override

4
src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
@@ -72,7 +72,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends
return;
}
mPreference.setEnabled(is5GhzBandSupported());
((SwitchPreference) mPreference).setChecked(mIsChecked);
((TwoStatePreference) mPreference).setChecked(mIsChecked);
mPreference.setSummary(mWifiManager.isBridgedApConcurrencySupported()
? R.string.wifi_hotspot_maximize_compatibility_dual_ap_summary
: R.string.wifi_hotspot_maximize_compatibility_single_ap_summary);