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

Remove accessibility duplicates in settings search

Browse Source 
Merge for: ag/2148817

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
This commit is contained in:
Matthew Fritze
2017-04-17 07:55:41 -07:00
parent 87dd45a3f1
commit 6ad5848775
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/accessibility_magnification_settings.xml
View File

@@ -14,6 +14,7 @@
limitations under the License. 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="magnification_preference_screen_title"
android:title="@string/accessibility_screen_magnification_title"> android:title="@string/accessibility_screen_magnification_title">
<Preference <Preference
android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment" android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"

10
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

@@ -31,9 +31,11 @@ import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.PreferenceController;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable; import com.android.settings.search.Indexable;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -42,6 +44,7 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra
Indexable { Indexable {
// Settings App preference keys // Settings App preference keys
private static final String PREFERENCE_TITLE_KEY = "magnification_preference_screen_title";
private static final String MAGNIFICATION_GESTURES_PREFERENCE_SCREEN_KEY = private static final String MAGNIFICATION_GESTURES_PREFERENCE_SCREEN_KEY =
"screen_magnification_gestures_preference_screen"; "screen_magnification_gestures_preference_screen";
private static final String MAGNIFICATION_NAVBAR_PREFERENCE_SCREEN_KEY = private static final String MAGNIFICATION_NAVBAR_PREFERENCE_SCREEN_KEY =
@@ -214,5 +217,12 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra
return Collections.emptyList(); return Collections.emptyList();
} }
} }
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
keys.add(PREFERENCE_TITLE_KEY);
return keys;
}
}; };
} }

2
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
View File

@@ -60,7 +60,7 @@ public class BaseSearchIndexProviderTest {
@Test @Test
public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() { public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() {
assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST); assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
} }
@Test @Test