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

Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-13 15:18:40 +00:00
committed by Android (Google) Code Review
parent c3d818653a 66869d2ff5
commit 6571548a37
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -21,6 +21,7 @@ import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.util.Log;
import androidx.appcompat.app.AlertDialog;
@@ -38,6 +39,7 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
@@ -185,6 +187,18 @@ public class NetworkDashboardFragment extends DashboardFragment implements
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.network_and_internet) {
@Override
// TODO(b/167474581): Should remove this method when Provider Model finished.
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
if (Utils.isProviderModelEnabled(context)) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.network_provider_internet;
return Arrays.asList(sir);
}
return super.getXmlResourcesToIndex(context, enabled);
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context
context) {