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

Revert "Revert "Share preference controller in AdavancedAppSettings search""

Browse Source 
Bug: 62141436
Test: make RunSettingsRoboTests -j40
This reverts commit b2676a769e.

Change-Id: I27c8df94a3103602d2e176670bcf1f82528e70c0
This commit is contained in:
Fan Zhang
2017-05-31 00:43:18 +00:00
parent 4fcb5f6b7c
commit c62808a5a3
3 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/android/settings/applications/AdvancedAppSettings.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.applications;
import android.app.Activity;
import android.content.Context;
import android.provider.SearchIndexableResource;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
@@ -57,6 +57,15 @@ public class AdvancedAppSettings extends DashboardFragment {
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
}
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_ADVANCED;
}
private static List<PreferenceController> buildPreferenceControllers(Context context) {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new DefaultBrowserPreferenceController(context));
controllers.add(new DefaultWorkBrowserPreferenceController(context));
@@ -68,11 +77,6 @@ public class AdvancedAppSettings extends DashboardFragment {
return controllers;
}
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_ADVANCED;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -94,6 +98,11 @@ public class AdvancedAppSettings extends DashboardFragment {
.getPreferenceKey());
return keys;
}
@Override
public List<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
}
};
static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -118,10 +127,10 @@ public class AdvancedAppSettings extends DashboardFragment {
return;
}
CharSequence summary = concatSummaryText(
mDefaultSmsPreferenceController.getDefaultAppLabel(),
mDefaultBrowserPreferenceController.getDefaultAppLabel());
mDefaultSmsPreferenceController.getDefaultAppLabel(),
mDefaultBrowserPreferenceController.getDefaultAppLabel());
summary = concatSummaryText(summary,
mDefaultPhonePreferenceController.getDefaultAppLabel());
mDefaultPhonePreferenceController.getDefaultAppLabel());
if (!TextUtils.isEmpty(summary)) {
mSummaryLoader.setSummary(this, summary);
}
@@ -139,11 +148,11 @@ public class AdvancedAppSettings extends DashboardFragment {
}
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
new SummaryLoader.SummaryProviderFactory() {
@Override
public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
SummaryLoader summaryLoader) {
return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
}
};
new SummaryLoader.SummaryProviderFactory() {
@Override
public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
SummaryLoader summaryLoader) {
return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
}
};
}