PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Settings search - Navigate user to exact page""

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-16 13:06:24 +00:00
committed by Android (Google) Code Review
parent 50d20369ae e19ee9a01f
commit 244afa02d2
56 changed files with 52 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
View File

@@ -201,5 +201,11 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_shortcut_settings);
new BaseSearchIndexProvider() {
// This fragment is for details of the shortcut. Only the shortcut itself needs
// to be indexed.
protected boolean isPageSearchEnabled(Context context) {
return false;
}
};
}

6
src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
View File

@@ -21,13 +21,10 @@ import android.os.Vibrator;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/**
* Fragment for picking accessibility shortcut service
*/
@SearchIndexable
public class NotificationVibrationPreferenceFragment extends VibrationPreferenceFragment {
@Override
public int getMetricsCategory() {
@@ -62,7 +59,4 @@ public class NotificationVibrationPreferenceFragment extends VibrationPreference
Vibrator vibrator = getContext().getSystemService(Vibrator.class);
return vibrator.getDefaultNotificationVibrationIntensity();
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_notification_vibration_settings);
}

6
src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
View File

@@ -21,13 +21,10 @@ import android.os.Vibrator;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/**
* Fragment for picking accessibility shortcut service
*/
@SearchIndexable
public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment {
@Override
public int getMetricsCategory() {
@@ -66,7 +63,4 @@ public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment
Vibrator vibrator = getContext().getSystemService(Vibrator.class);
return vibrator.getDefaultRingVibrationIntensity();
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_ring_vibration_settings);
}

6
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -43,10 +43,8 @@ import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.RadioButtonPreference;
@@ -57,7 +55,6 @@ import java.util.Map;
/**
* Fragment for picking accessibility shortcut service
*/
@SearchIndexable
public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
@Override
@@ -267,7 +264,4 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
return mServiceInfo.getComponentName().flattenToString();
}
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_shortcut_service_settings);
}

6
src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
View File

@@ -21,13 +21,10 @@ import android.os.Vibrator;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/**
* Fragment for picking accessibility shortcut service
*/
@SearchIndexable
public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragment {
@Override
public int getMetricsCategory() {
@@ -62,7 +59,4 @@ public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragmen
protected int getPreviewVibrationAudioAttributesUsage() {
return AudioAttributes.USAGE_ASSISTANCE_SONIFICATION;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_touch_vibration_settings);
}