Merge "Handle cached bluetooth device with stylus pref" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
e8f6a7572c
@@ -54,7 +54,7 @@ import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceCategory;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.preference.SwitchPreferenceCompat;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
@@ -518,7 +518,8 @@ public class StylusDevicesControllerTest {
|
||||
Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);
|
||||
|
||||
showScreen(mController);
|
||||
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
|
||||
SwitchPreferenceCompat buttonsPref =
|
||||
(SwitchPreferenceCompat) mPreferenceContainer.getPreference(2);
|
||||
|
||||
assertThat(buttonsPref.isChecked()).isEqualTo(true);
|
||||
}
|
||||
@@ -529,7 +530,8 @@ public class StylusDevicesControllerTest {
|
||||
Settings.Secure.STYLUS_BUTTONS_ENABLED, 1);
|
||||
|
||||
showScreen(mController);
|
||||
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
|
||||
SwitchPreferenceCompat buttonsPref =
|
||||
(SwitchPreferenceCompat) mPreferenceContainer.getPreference(2);
|
||||
|
||||
assertThat(buttonsPref.isChecked()).isEqualTo(false);
|
||||
}
|
||||
@@ -539,7 +541,8 @@ public class StylusDevicesControllerTest {
|
||||
Settings.Secure.putInt(mContext.getContentResolver(),
|
||||
Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);
|
||||
showScreen(mController);
|
||||
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
|
||||
SwitchPreferenceCompat buttonsPref =
|
||||
(SwitchPreferenceCompat) mPreferenceContainer.getPreference(2);
|
||||
|
||||
buttonsPref.performClick();
|
||||
|
||||
|
Reference in New Issue
Block a user