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

Commit 1ae1e171 authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix indexing in cast and zen mode settings 

- Fragment should either not implement serach provider or return a valid
  xml. Search provider with 0 resource is invalid.

Change-Id: Ie87c739bf72c926cecf48d271c6c2d72459787c4
Fixes: 69864274
Test: robotests
parent 6a68f306

res/xml/wifi_display_settings.xml

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

-->



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

<PreferenceScreen

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

    android:key="wifi_display_settings_screen"

    android:title="@string/wifi_display_settings_title">



</PreferenceScreen>

src/com/android/settings/notification/ZenModeAutomationSettings.java

+27 −13
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.notification; 


import android.app.Fragment;

import android.content.Context;

import android.provider.SearchIndexableResource;

import android.service.notification.ConditionProviderService;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -78,6 +79,18 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { 
     */

    public static final Indexable.SearchIndexProvider 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.zen_mode_automation_settings;

                    result.add(sir);

                    return result;

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> keys = super.getNonIndexableKeys(context);
@@ -87,7 +100,8 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { 
                }



                @Override

        public List<AbstractPreferenceController> getPreferenceControllers(Context context) {

                public List<AbstractPreferenceController> getPreferenceControllers(

                        Context context) {

                    return buildPreferenceControllers(context, null, null);

                }

            };

src/com/android/settings/notification/ZenModeBehaviorSettings.java

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.notification;



import android.content.Context;

import android.provider.SearchIndexableResource;



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

import com.android.settings.R;
@@ -65,6 +66,18 @@ public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Inde 
     */

    public static final Indexable.SearchIndexProvider 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.zen_mode_behavior_settings;

                    result.add(sir);

                    return result;

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

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

src/com/android/settings/notification/ZenModeRuleSettingsBase.java

+0 −31
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnClickListener; 
import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.provider.SearchIndexableResource;

import android.service.notification.ConditionProviderService;

import android.support.v7.preference.DropDownPreference;

import android.support.v7.preference.Preference;
@@ -44,15 +43,9 @@ import android.widget.Toast; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.widget.SwitchBar;

import com.android.settingslib.core.AbstractPreferenceController;



import java.util.Arrays;

import java.util.List;



import java.util.Arrays;

import java.util.List;



public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase
@@ -62,8 +55,6 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase 


    private static final String KEY_RULE_NAME = "rule_name";

    private static final String KEY_ZEN_MODE = "zen_mode";

    private static final String KEY_EVENT_RULE_SETTINGS = "zen_mode_event_rule_settings";

    private static final String KEY_SCHEDULE_RULE_SETTINGS = "zen_mode_schedule_rule_settings";



    protected Context mContext;

    protected boolean mDisableListeners;
@@ -306,26 +297,4 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase 
        }

        mDisableListeners = false;

    }



    /**

     * For Search.

     */

    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    // not indexable

                    return Arrays.asList(sir);

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

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

                    keys.add(KEY_SCHEDULE_RULE_SETTINGS);

                    keys.add(KEY_EVENT_RULE_SETTINGS);

                    return keys;

                }

            };

}

src/com/android/settings/search/SearchIndexableResources.java

+2 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.settings.datausage.DataUsageMeteredSettings; 
import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.deviceinfo.Status;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.display.AmbientDisplaySettings;
@@ -69,8 +68,6 @@ import com.android.settings.notification.ConfigureNotificationSettings; 
import com.android.settings.notification.SoundSettings;

import com.android.settings.notification.ZenModeAutomationSettings;

import com.android.settings.notification.ZenModeBehaviorSettings;

import com.android.settings.notification.ZenModeEventRuleSettings;

import com.android.settings.notification.ZenModeScheduleRuleSettings;

import com.android.settings.notification.ZenModeSettings;

import com.android.settings.print.PrintSettingsFragment;

import com.android.settings.security.EncryptionAndCredential;
@@ -86,6 +83,7 @@ import com.android.settings.tts.TextToSpeechSettings; 
import com.android.settings.tts.TtsEnginePreferenceFragment;

import com.android.settings.users.UserSettings;

import com.android.settings.wallpaper.WallpaperTypeSettings;

import com.android.settings.wfd.WifiDisplaySettings;

import com.android.settings.wifi.ConfigureWifiSettings;

import com.android.settings.wifi.WifiSettings;
@@ -169,10 +167,9 @@ public final class SearchIndexableResources { 
        addIndex(PowerUsageSummary.class);

        addIndex(BatterySaverSettings.class);

        addIndex(LockscreenDashboardFragment.class);

        addIndex(WifiDisplaySettings.class);

        addIndex(ZenModeBehaviorSettings.class);

        addIndex(ZenModeAutomationSettings.class);

        addIndex(ZenModeEventRuleSettings.class);

        addIndex(ZenModeScheduleRuleSettings.class);

    }



    private SearchIndexableResources() {