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

Commit 3c89f501 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Index input & gesture settings page."

parents 7ce10b65 f10a5a22

res/xml/double_twist_gesture_settings.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:app="http://schemas.android.com/apk/res-auto">

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

                  android:title="@string/double_twist_for_camera_mode_title">



    <com.android.settings.widget.VideoPreference

        android:key="gesture_double_twist_video"

res/xml/input_and_gesture.xml

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,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:title="@string/input_gesture_settings_title">



    <PreferenceCategory

        android:title="@string/keyboard_and_input_methods_category">

src/com/android/settings/inputmethod/InputAndGestureSettings.java

+19 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.inputmethod; 


import android.content.Context;

import android.os.UserHandle;

import android.provider.SearchIndexableResource;

import android.support.annotation.VisibleForTesting;



import com.android.internal.hardware.AmbientDisplayConfiguration;
@@ -31,9 +32,12 @@ import com.android.settings.gestures.DoubleTapScreenPreferenceController; 
import com.android.settings.gestures.DoubleTwistPreferenceController;

import com.android.settings.gestures.PickupGesturePreferenceController;

import com.android.settings.gestures.SwipeToNotificationPreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.drawer.CategoryKey;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class InputAndGestureSettings extends DashboardFragment {
@@ -90,4 +94,19 @@ public class InputAndGestureSettings extends DashboardFragment { 
    void setAmbientDisplayConfig(AmbientDisplayConfiguration ambientConfig) {

        mAmbientDisplayConfig = ambientConfig;

    }



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

                    return Arrays.asList(sir);

                }

            };

}

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

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.settings.gestures.GestureSettings; 
import com.android.settings.gestures.PickupGestureSettings;

import com.android.settings.gestures.SwipeToNotificationSettings;

import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;

import com.android.settings.inputmethod.InputAndGestureSettings;

import com.android.settings.inputmethod.InputMethodAndLanguageSettings;

import com.android.settings.inputmethod.PhysicalKeyboardFragment;

import com.android.settings.inputmethod.VirtualKeyboardFragment;
@@ -136,6 +137,7 @@ public final class SearchIndexableResources { 
        addIndex(DoubleTwistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures);

        addIndex(SwipeToNotificationSettings.class, NO_DATA_RES_ID,

                R.drawable.ic_settings_gestures);

        addIndex(InputAndGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);

        addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location);

        addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location);

        addIndex(SecuritySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security);

tests/robotests/assets/grandfather_not_implementing_indexable

+2 −1
Original line number Diff line number Diff line
@@ -90,3 +90,4 @@ com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment 
com.android.settings.applications.ConvertToFbe

com.android.settings.localepicker.LocaleListEditor

com.android.settings.qstile.DevelopmentTileConfigActivity$DevelopmentTileConfigFragment

com.android.settings.applications.ExternalSourcesDetails
 
 No newline at end of file