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

Refactor DefaultAppPicker to a general radio button picker

Browse Source 
Bug: 36557316
Test: make RunSettingsRoboTests
Change-Id: I52985e527e55697cf29f8d97d775d4bbed025beb
This commit is contained in:
Fan Zhang
2017-03-23 11:03:29 -07:00
parent b3f13f9f32
commit a278962dbc
37 changed files with 580 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
View File

@@ -61,12 +61,12 @@ public class DefaultAssistPickerTest {
final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
mPicker.setDefaultAppKey(TEST_ASSIST.flattenToString());
mPicker.setDefaultKey(TEST_ASSIST.flattenToString());
assertThat(Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.ASSISTANT))
.isEqualTo(TEST_ASSIST.flattenToString());
assertThat(mPicker.getDefaultAppKey())
assertThat(mPicker.getDefaultKey())
.isEqualTo(TEST_ASSIST.flattenToString());
}
@@ -74,12 +74,12 @@ public class DefaultAssistPickerTest {
public void setDefaultAppKey_noAvaialbleAssit_shouldClearDefaultAssist() {
final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
mPicker.setDefaultAppKey(TEST_ASSIST.flattenToString());
mPicker.setDefaultKey(TEST_ASSIST.flattenToString());
assertThat(Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.ASSISTANT))
.isEmpty();
assertThat(mPicker.getDefaultAppKey())
assertThat(mPicker.getDefaultKey())
.isNull();
}
@@ -88,12 +88,12 @@ public class DefaultAssistPickerTest {
final List<DefaultAssistPicker.Info> assistants = new ArrayList<>();
assistants.add(new DefaultAssistPicker.Info(TEST_ASSIST));
ReflectionHelpers.setField(mPicker, "mAvailableAssistants", assistants);
mPicker.setDefaultAppKey(null);
mPicker.setDefaultKey(null);
assertThat(Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.ASSISTANT))
.isEmpty();
assertThat(mPicker.getDefaultAppKey())
assertThat(mPicker.getDefaultKey())
.isNull();
}
}