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

Commit 6e88635e authored by Fan Zhang's avatar Fan Zhang
Browse files

Add search provider for dashboard fragments in new IA. 

Bug: 33252252
Test: make RunSettingsRoboTests
Change-Id: I8ea3a144f2bee3d979b909aba29a3360e25fd04b
parent ee524404

res/xml/app_and_notification.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 


<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:title="@string/app_and_notification_dashboard_title">



    <Preference

        android:key="manage_perms"

res/xml/network_and_internet.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:title="@string/network_dashboard_title">



    <SwitchPreference

        android:key="toggle_airplane"

res/xml/user_and_accounts_settings.xml

+8 −7
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

        android:title="@string/account_settings_title"

    android:title="@string/account_dashboard_title"

    settings:keywords="@string/keywords_accounts">



    <Preference

src/com/android/settings/accounts/UserAndAccountDashboardFragment.java

+21 −7
Original line number Diff line number Diff line
@@ -16,19 +16,20 @@ 
package com.android.settings.accounts;



import android.content.Context;



import android.os.Bundle;

import android.support.v7.preference.Preference;

import android.util.ArraySet;

import android.provider.SearchIndexableResource;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.drawer.CategoryKey;



import com.android.settingslib.drawer.Tile;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.Arrays;

import java.util.List;



import static android.provider.Settings.EXTRA_AUTHORITIES;
@@ -37,7 +38,6 @@ public class UserAndAccountDashboardFragment extends DashboardFragment { 


    private static final String TAG = "UserAndAccountDashboard";

    private static final String METADATA_IA_ACCOUNT = "com.android.settings.ia.account";

    private HashMap<String, ArraySet<Preference>> mAccountTiles = new HashMap<>();



    @Override

    public int getMetricsCategory() {
@@ -87,4 +87,18 @@ public class UserAndAccountDashboardFragment extends DashboardFragment { 
        return true;

    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)

                            .isEnabled()) {

                        return null;

                    }

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.user_and_accounts_settings;

                    return Arrays.asList(sir);

                }

            };

}
 
 No newline at end of file

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

+19 −0
Original line number Diff line number Diff line
@@ -17,12 +17,16 @@ 
package com.android.settings.applications;



import android.content.Context;

import android.provider.SearchIndexableResource;



import com.android.settings.R;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.drawer.CategoryKey;



import java.util.Arrays;

import java.util.List;



public class AppAndNotificationDashboardFragment extends DashboardFragment {
@@ -53,4 +57,19 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { 
    protected List<PreferenceController> getPreferenceControllers(Context context) {

        return null;

    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context)

                            .isEnabled()) {

                        return null;

                    }

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.app_and_notification;

                    return Arrays.asList(sir);

                }

            };

}