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

Update UWB toggle state with a getter API

Browse Source 
Also updates capitalization for strings

Test: Manual on Raven & Robotest
Bug: 183254940
Change-Id: I9d3a4694746b44e80c60a9097abd0cbb647c1348
This commit is contained in:
Joy Babafemi
2021-04-22 17:20:03 +00:00
parent 16f3036c4b
commit 7cf391dddd
3 changed files with 16 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -13220,11 +13220,11 @@
<string name="request_manage_bluetooth_permission_dont_allow">Don\u2019t allow</string>
<!-- Title for UWB preference [CHAR_LIMIT=60] -->
<string name="uwb_settings_title">Ultra-WideBand (UWB)</string>
<string name="uwb_settings_title">Ultra-Wideband (UWB)</string>
<!-- Summary for UWB preference. [CHAR_LIMIT=NONE]-->
<string name="uwb_settings_summary">Helps identify the relative position of nearby devices that have UWB</string>
<!-- Summary for UWB preference when airplane mode is disabled. [CHAR_LIMIT=NONE]-->
<string name="uwb_settings_summary_airplane_mode">Turn off Airplane mode to use UWB. </string>
<string name="uwb_settings_summary_airplane_mode">Turn off airplane mode to use UWB </string>
</resources>

31
src/com/android/settings/uwb/UwbPreferenceController.java
View File

@@ -52,8 +52,6 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
@VisibleForTesting
private final BroadcastReceiver mAirplaneModeChangedReceiver;
private final Executor mExecutor;
private boolean mIsChecked = true;
boolean mRegisteredAdapterStateCallback = false;
private Preference mPreference;
public UwbPreferenceController(Context context, String key) {
@@ -94,26 +92,26 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
@Override
public boolean isChecked() {
//TODO(b/186075119): Update toggle state by assigning to the real value by default.
return mIsChecked;
int state = mUwbManager.getAdapterState();
return state == STATE_ENABLED_ACTIVE || state == STATE_ENABLED_INACTIVE;
}
@Override
public boolean setChecked(boolean isChecked) {
mIsChecked = isChecked;
mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
if (isUwbSupportedOnDevice()) {
if (mAirplaneModeOn) {
mUwbManager.setUwbEnabled(false);
} else {
mUwbManager.setUwbEnabled(isChecked);
}
}
return true;
}
@Override
public void onStateChanged(int state, int reason) {
// Only update toggle state from service the first time. Otherwise toggle state is
// changed from controller. For example, UWB is disabled if airplane mode is on but we do
// not want to change the preference for the user in this case.
if (!mRegisteredAdapterStateCallback) {
mIsChecked = state == STATE_ENABLED_ACTIVE || state == STATE_ENABLED_INACTIVE;
mRegisteredAdapterStateCallback = true;
}
}
/** Called when activity starts being displayed to user. */
@@ -143,16 +141,7 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
@Override
public void updateState(Preference preference) {
super.updateState(preference);
mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
preference.setEnabled(!mAirplaneModeOn);
if (isUwbSupportedOnDevice()) {
if (mAirplaneModeOn) {
mUwbManager.setUwbEnabled(false);
} else {
mUwbManager.setUwbEnabled(mIsChecked);
}
}
refreshSummary(preference);
}

46
tests/robotests/src/com/android/settings/uwb/UwbPreferenceControllerTest.java
View File

@@ -94,55 +94,15 @@ public class UwbPreferenceControllerTest {
}
@Test
public void onStateChanged_stateNotRegistered_shouldUpdate() {
mController.mRegisteredAdapterStateCallback = false;
mController.onStateChanged(UwbManager.AdapterStateCallback.STATE_DISABLED,
UwbManager.AdapterStateCallback.STATE_CHANGED_REASON_SYSTEM_POLICY);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void onStateChanged_stateRegistered_shouldNotUpdate() {
mController.mRegisteredAdapterStateCallback = true;
mController.onStateChanged(UwbManager.AdapterStateCallback.STATE_ENABLED_INACTIVE,
UwbManager.AdapterStateCallback.STATE_CHANGED_REASON_SYSTEM_POLICY);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void isChecked_uwbEnabledInactive_shouldReturnTrue() {
doReturn(mPackageManager).when(mContext).getPackageManager();
doReturn(true).when(mPackageManager)
.hasSystemFeature(PackageManager.FEATURE_UWB);
mController.mRegisteredAdapterStateCallback = false;
mController.onStateChanged(UwbManager.AdapterStateCallback.STATE_ENABLED_INACTIVE,
UwbManager.AdapterStateCallback.STATE_CHANGED_REASON_SYSTEM_POLICY);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void isChecked_uwbEnabledActive_shouldReturnTrue() {
doReturn(mPackageManager).when(mContext).getPackageManager();
doReturn(true).when(mPackageManager)
.hasSystemFeature(PackageManager.FEATURE_UWB);
mController.mRegisteredAdapterStateCallback = false;
mController.onStateChanged(UwbManager.AdapterStateCallback.STATE_ENABLED_ACTIVE,
UwbManager.AdapterStateCallback.STATE_CHANGED_REASON_SYSTEM_POLICY);
public void isChecked_uwbEnabled_shouldReturnTrue() {
doReturn(mController.STATE_ENABLED_ACTIVE).when(mUwbManager).getAdapterState();
assertThat(mController.isChecked()).isTrue();
}
@Test
public void isChecked_uwbDisabled_shouldReturnFalse() {
doReturn(mPackageManager).when(mContext).getPackageManager();
doReturn(true).when(mPackageManager)
.hasSystemFeature(PackageManager.FEATURE_UWB);
mController.mRegisteredAdapterStateCallback = false;
mController.onStateChanged(UwbManager.AdapterStateCallback.STATE_DISABLED,
UwbManager.AdapterStateCallback.STATE_CHANGED_REASON_SYSTEM_POLICY);
doReturn(mController.STATE_DISABLED).when(mUwbManager).getAdapterState();
assertThat(mController.isChecked()).isFalse();
}