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

Commit ee524404 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add search indexing for new gesture pages. 

Bug: 33252252
Test: make RunSettingsRoboTests
Change-Id: I927e5b9b87b226ea5ce2006fc2524ac8db740446
parent da32519e

res/xml/pick_up_gesture_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
  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:app="http://schemas.android.com/apk/res-auto">



    <com.android.settings.widget.VideoPreference

src/com/android/settings/gestures/DoubleTapPowerSettings.java

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



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 java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class DoubleTapPowerSettings extends DashboardFragment {
@@ -55,4 +59,19 @@ public class DoubleTapPowerSettings extends DashboardFragment { 
        controllers.add(new DoubleTapPowerPreferenceController(context, getLifecycle()));

        return controllers;

    }



    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.double_tap_power_settings;

                    return Arrays.asList(sir);

                }

            };

}

src/com/android/settings/gestures/DoubleTapScreenSettings.java

+19 −0
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ package com.android.settings.gestures; 


import android.content.Context;

import android.os.UserHandle;

import android.provider.SearchIndexableResource;



import com.android.internal.hardware.AmbientDisplayConfiguration;

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 java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class DoubleTapScreenSettings extends DashboardFragment {
@@ -58,4 +62,19 @@ public class DoubleTapScreenSettings extends DashboardFragment { 
                new AmbientDisplayConfiguration(context), UserHandle.myUserId()));

        return controllers;

    }



    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.double_tap_screen_settings;

                    return Arrays.asList(sir);

                }

            };

}

src/com/android/settings/gestures/DoubleTwistGestureSettings.java

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



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 java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class DoubleTwistGestureSettings extends DashboardFragment {
@@ -55,4 +59,19 @@ public class DoubleTwistGestureSettings extends DashboardFragment { 
        controllers.add(new DoubleTwistPreferenceController(context, getLifecycle()));

        return controllers;

    }



    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.double_twist_gesture_settings;

                    return Arrays.asList(sir);

                }

            };

}

src/com/android/settings/gestures/PickupGestureSettings.java

+20 −0
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ package com.android.settings.gestures; 


import android.content.Context;

import android.os.UserHandle;

import android.provider.SearchIndexableResource;



import com.android.internal.hardware.AmbientDisplayConfiguration;

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 java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class PickupGestureSettings extends DashboardFragment {
@@ -58,4 +62,20 @@ public class PickupGestureSettings extends DashboardFragment { 
                new AmbientDisplayConfiguration(context), UserHandle.myUserId()));

        return controllers;

    }



    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.pick_up_gesture_settings;

                    return Arrays.asList(sir);

                }

            };



}