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

Remove unused resources

Browse Source 
Bug: 123794771
Test: rebuild, robolectric
Change-Id: I22f43220cc9ad4ec2074af425b0da75f59e470a4
This commit is contained in:
Raff Tsai
2019-11-07 18:10:14 +08:00
parent efcfbaeb5a
commit 4992919d95
5 changed files with 7 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import static com.android.settings.network.MobilePlanPreferenceController.MANAGE
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import android.util.Log;
import androidx.appcompat.app.AlertDialog;
@@ -37,7 +36,6 @@ 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
@@ -143,14 +141,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.network_and_internet_v2;
return Arrays.asList(sir);
}
new BaseSearchIndexProvider(R.xml.network_and_internet_v2) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context

14
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -49,7 +48,6 @@ import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -261,17 +259,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.mobile_network_settings_v2;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.mobile_network_settings_v2) {
/** suppress full page if user is not admin */
@Override