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

Merge "Handle cached bluetooth device with stylus pref" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-11-21 12:59:39 +00:00
committed by Android (Google) Code Review
parent 5bbccc8701 dcb5bc6da5
commit e8f6a7572c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,10 +108,15 @@ public class StylusDevicesController extends AbstractPreferenceController implem
return null; return null;
} }
boolean doesStylusSupportTailButton = mInputDevice.hasKeys( // Check if the connected stylus supports the tail button. A connected device is when input
KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL)[0]; // device is available (mInputDevice != null). For a cached device (mInputDevice == null)
if (!doesStylusSupportTailButton) { // there isn't way to check if the device supports the button so assume it does.
return null; if (mInputDevice != null) {
boolean doesStylusSupportTailButton =
mInputDevice.hasKeys(KeyEvent.KEYCODE_STYLUS_BUTTON_TAIL)[0];
if (!doesStylusSupportTailButton) {
return null;
}
} }
Preference pref = preference == null ? new Preference(mContext) : preference; Preference pref = preference == null ? new Preference(mContext) : preference;

11
tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
View File

@@ -54,7 +54,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreferenceCompat;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
@@ -518,7 +518,8 @@ public class StylusDevicesControllerTest {
Settings.Secure.STYLUS_BUTTONS_ENABLED, 0); Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);
showScreen(mController); showScreen(mController);
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2); SwitchPreferenceCompat buttonsPref =
(SwitchPreferenceCompat) mPreferenceContainer.getPreference(2);
assertThat(buttonsPref.isChecked()).isEqualTo(true); assertThat(buttonsPref.isChecked()).isEqualTo(true);
} }
@@ -529,7 +530,8 @@ public class StylusDevicesControllerTest {
Settings.Secure.STYLUS_BUTTONS_ENABLED, 1); Settings.Secure.STYLUS_BUTTONS_ENABLED, 1);
showScreen(mController); showScreen(mController);
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2); SwitchPreferenceCompat buttonsPref =
(SwitchPreferenceCompat) mPreferenceContainer.getPreference(2);
assertThat(buttonsPref.isChecked()).isEqualTo(false); assertThat(buttonsPref.isChecked()).isEqualTo(false);
} }
@@ -539,7 +541,8 @@ public class StylusDevicesControllerTest {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_BUTTONS_ENABLED, 0); Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);
showScreen(mController); showScreen(mController);
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2); SwitchPreferenceCompat buttonsPref =
(SwitchPreferenceCompat) mPreferenceContainer.getPreference(2);
buttonsPref.performClick(); buttonsPref.performClick();