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

Merge "Support "Add account" search indexing" into main

Browse Source
This commit is contained in:
Jason Chiu
2024-01-04 02:39:05 +00:00
committed by Android (Google) Code Review
parent 1b2ee40841 01f992a698
commit 2c2dd72ff7
3 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -187,6 +187,11 @@ public class AccountPreferenceController extends AbstractPreferenceController
updateUi();
}
@Override
public void updateRawDataToIndex(List<SearchIndexableRaw> rawData) {
rawData.add(newAddAccountRawData());
}
@Override
public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) {
if (!isAvailable()) {
@@ -428,6 +433,14 @@ public class AccountPreferenceController extends AbstractPreferenceController
}));
}
private SearchIndexableRaw newAddAccountRawData() {
SearchIndexableRaw data = new SearchIndexableRaw(mContext);
data.key = PREF_KEY_ADD_ACCOUNT;
data.title = mContext.getString(R.string.add_account_label);
data.iconResId = R.drawable.ic_add_24dp;
return data;
}
private RestrictedPreference newAddAccountPreference() {
RestrictedPreference preference =
new RestrictedPreference(mFragment.getPreferenceManager().getContext());

14
src/com/android/settings/search/BaseSearchIndexProvider.java
View File

@@ -73,7 +73,19 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
return null;
final List<SearchIndexableRaw> raws = new ArrayList<>();
final List<AbstractPreferenceController> controllers = getPreferenceControllers(context);
if (controllers == null || controllers.isEmpty()) {
return raws;
}
for (AbstractPreferenceController controller : controllers) {
if (controller instanceof PreferenceControllerMixin) {
((PreferenceControllerMixin) controller).updateRawDataToIndex(raws);
} else if (controller instanceof BasePreferenceController) {
((BasePreferenceController) controller).updateRawDataToIndex(raws);
}
}
return raws;
}
@Override

29
tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
View File

@@ -254,25 +254,26 @@ public class AccountPreferenceControllerTest {
}
@Test
public void updateRawDataToIndex_ManagedProfile_shouldNotUpdate() {
public void updateRawDataToIndex_noManagedProfile_shouldContainAddAccount() {
final List<SearchIndexableRaw> data = new ArrayList<>();
when(mUserManager.isManagedProfile()).thenReturn(false);
mController.updateRawDataToIndex(data);
assertThat(data).hasSize(1);
assertThat(data.get(0).key).isEqualTo("add_account");
}
@Test
public void updateRawDataToIndex_ManagedProfile_shouldContainAddAccount() {
final List<SearchIndexableRaw> data = new ArrayList<>();
when(mUserManager.isManagedProfile()).thenReturn(true);
mController.updateRawDataToIndex(data);
assertThat(data).isEmpty();
}
@Test
public void updateRawDataToIndex_DisabledUser_shouldNotUpdate() {
final List<SearchIndexableRaw> data = new ArrayList<>();
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_DISABLED));
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.updateRawDataToIndex(data);
assertThat(data).isEmpty();
assertThat(data).hasSize(1);
assertThat(data.get(0).key).isEqualTo("add_account");
}
@Test