Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3541f597 authored by Fan Zhang's avatar Fan Zhang
Browse files

Share preference controller in AdavancedAppSettings search 

Change-Id: I4283f35a91ce10e01fa4c9d1cf626b1d2a30082c
Fix: 62141436
Test: make RunSettingsRoboTests
parent 3cad98f6

src/com/android/settings/applications/AdvancedAppSettings.java

+25 −16
Original line number Diff line number Diff line
@@ -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 {

tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider

+0 −1
Original line number Diff line number Diff line 
com.android.settings.applications.AdvancedAppSettings

com.android.settings.fuelgauge.PowerUsageSummary