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

Merge "Remove accessibility duplicates in settings search"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-02 19:07:42 +00:00
committed by Android (Google) Code Review
parent e1e918e4a8 49915a64c5
commit e2987d7173
4 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -46,6 +46,7 @@ import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.DisplaySettings;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
@@ -721,7 +722,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
List<SearchIndexableRaw> indexables = new ArrayList<SearchIndexableRaw>();
List<SearchIndexableRaw> indexables = new ArrayList<>();
PackageManager packageManager = context.getPackageManager();
AccessibilityManager accessibilityManager =
@@ -763,5 +764,15 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
indexables.add(indexable);
return indexables;
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
// Duplicates in Display
keys.add(FONT_SIZE_PREFERENCE_SCREEN);
keys.add(DisplaySettings.KEY_DISPLAY_SIZE);
return keys;
}
};
}