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

Commit 02caf0f8 authored by Fan Zhang's avatar Fan Zhang
Browse files

Misc fixes to improve search 

- Suppress one of results from "On lock screen"
- Remove screen title from sub sections in data usage screen.
- On UserSettins, index using resource instead raw. And build
  non-indexables using getNonIndexable and pref controlleres.

Change-Id: I947a97af60f1a08b237fda2f3c456cf1105b9231
Fixes: 74120518
Fixes: 74119743
Fixes: 74250251
Fixes: 74119687
Test: reindex
parent 3c5aeac3

res/xml/data_usage_cellular.xml

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




<PreferenceScreen

<PreferenceScreen

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

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

    android:key="data_usage_cellular_screen"

    android:key="data_usage_cellular_screen">

    android:title="@string/data_usage_summary_title">





    <com.android.settings.datausage.TemplatePreferenceCategory

    <com.android.settings.datausage.TemplatePreferenceCategory

        android:key="mobile_category"

        android:key="mobile_category"

res/xml/data_usage_wifi.xml

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




<PreferenceScreen

<PreferenceScreen

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

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

    android:key="data_usage_wifi_screen"

    android:key="data_usage_wifi_screen">

    android:title="@string/data_usage_summary_title">





    <com.android.settings.datausage.TemplatePreferenceCategory

    <com.android.settings.datausage.TemplatePreferenceCategory

        android:key="wifi_category"

        android:key="wifi_category"

src/com/android/settings/security/LockscreenDashboardFragment.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -22,10 +22,10 @@ import android.support.annotation.VisibleForTesting; 




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

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

import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.users.AddUserWhenLockedPreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.notification.LockScreenNotificationPreferenceController;

import com.android.settings.notification.LockScreenNotificationPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.users.AddUserWhenLockedPreferenceController;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -130,6 +130,7 @@ public class LockscreenDashboardFragment extends DashboardFragment 
                public List<String> getNonIndexableKeys(Context context) {

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> niks = super.getNonIndexableKeys(context);

                    final List<String> niks = super.getNonIndexableKeys(context);

                    niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);

                    niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);

                    niks.add(KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);

                    return niks;

                    return niks;

                }

                }

            };

            };

src/com/android/settings/users/UserSettings.java

+31 −32
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.ContactsContract;

import android.provider.ContactsContract;

import android.provider.SearchIndexableResource;

import android.provider.Settings.Global;

import android.provider.Settings.Global;

import android.support.annotation.VisibleForTesting;

import android.support.annotation.VisibleForTesting;

import android.support.annotation.WorkerThread;

import android.support.annotation.WorkerThread;
@@ -68,7 +69,6 @@ import com.android.settings.dashboard.SummaryLoader; 
import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.RestrictedPreference;
@@ -203,7 +203,6 @@ public class UserSettings extends SettingsPreferenceFragment 
        final Context context = getActivity();

        final Context context = getActivity();

        mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(

        mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(

                context, KEY_ADD_USER_WHEN_LOCKED, getLifecycle());

                context, KEY_ADD_USER_WHEN_LOCKED, getLifecycle());



        mAutoSyncDataPreferenceController = new AutoSyncDataPreferenceController(context, this);

        mAutoSyncDataPreferenceController = new AutoSyncDataPreferenceController(context, this);

        mAutoSyncPersonalDataPreferenceController =

        mAutoSyncPersonalDataPreferenceController =

                new AutoSyncPersonalDataPreferenceController(context, this);

                new AutoSyncPersonalDataPreferenceController(context, this);
@@ -1186,41 +1185,41 @@ public class UserSettings extends SettingsPreferenceFragment 
    }

    }





    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =

    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =

        new SummaryLoader.SummaryProviderFactory() {

            (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);

            @Override

            public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,

                    SummaryLoader summaryLoader) {

                return new SummaryProvider(activity, summaryLoader);

            }

        };





    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

            new BaseSearchIndexProvider() {



                @Override

                @Override

                public List<SearchIndexableRaw> getRawDataToIndex(Context context,

                protected boolean isPageSearchEnabled(Context context) {

                        boolean enabled) {

                    final List<SearchIndexableRaw> result = new ArrayList<>();

                    final UserCapabilities userCaps = UserCapabilities.create(context);

                    final UserCapabilities userCaps = UserCapabilities.create(context);

                    if (!userCaps.mEnabled) {

                    return userCaps.mEnabled;

                        return result;

                }

                    }



                    final Resources res = context.getResources();

                @Override

                    SearchIndexableRaw data = new SearchIndexableRaw(context);

                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,

                    data.title = res.getString(R.string.user_settings_title);

                        boolean enabled) {

                    data.key = "users_settings";

                    final List<SearchIndexableResource> index = new ArrayList<>();

                    data.screenTitle = res.getString(R.string.user_settings_title);

                    // Append the rest of the settings

                    result.add(data);

                    final SearchIndexableResource sir = new SearchIndexableResource(context);



                    sir.xmlResId = R.xml.user_settings;

                    if (userCaps.mCanAddUser || userCaps.mDisallowAddUserSetByAdmin) {

                    index.add(sir);

                        data = new SearchIndexableRaw(context);

                    return index;

                        data.title = res.getString(userCaps.mCanAddRestrictedProfile ?

                }

                                R.string.user_add_user_or_profile_menu



                                : R.string.user_add_user_menu);

                @Override

                        data.screenTitle = res.getString(R.string.user_settings_title);

                public List<String> getNonIndexableKeysFromXml(Context context, int xmlResId) {

                        data.key = "user_settings_add_users";

                    final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId);

                        result.add(data);

                    new AddUserWhenLockedPreferenceController(

                    }

                            context, KEY_ADD_USER_WHEN_LOCKED, null /* lifecycle */)

                    return result;

                            .updateNonIndexableKeys(niks);

                    new AutoSyncDataPreferenceController(context, null /* parent */)

                            .updateNonIndexableKeys(niks);

                    new AutoSyncPersonalDataPreferenceController(context, null /* parent */)

                            .updateNonIndexableKeys(niks);

                    new AutoSyncWorkDataPreferenceController(context, null /* parent */)

                            .updateNonIndexableKeys(niks);

                    return niks;

                }

                }

            };

            };