diff --git a/res/values/strings.xml b/res/values/strings.xml index ef0a0517584..5b0a4e1d291 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5853,29 +5853,29 @@ Window Magnifier, Zoom, Magnification, Low vision, Enlarge, make bigger - Screen reader, Voice Over, VoiceOver, Voice Assistance, Blind, Low Vision, TTS, text to speech, spoken feedback + Captions, closed captions, CC, Live Transcribe, hard of hearing, hearing loss, CART, speech to text, subtitle - Captions, closed captions, CC, Live Caption, hard of hearing, hearing loss, CART, speech to text, subtitle + - Notifications, hard of hearing, hearing loss, notify + - PSAP, amplify, sound amplification, hard of hearing, hearing loss, amplification + screen size, large screen High contrast, low vision, bold font, bold face - Hear text, read aloud, speak screen, screen reader + adjust color turn screen dark, turn screen light - motor, quick menu, assistive menu, touch, dexterity + - motor, switch, hand, AT, assistive technology, paralysis, ALS, scanning, step scanning + motor, mouse @@ -5883,7 +5883,7 @@ hard of hearing, hearing loss, captions, Teletype, tty - voice, voice control, motor, hand, mic, microphone, dictation, talk, control + diff --git a/src/com/android/settings/accessibility/AccessibilitySearchFeatureProvider.java b/src/com/android/settings/accessibility/AccessibilitySearchFeatureProvider.java new file mode 100644 index 00000000000..6aa8c841ed1 --- /dev/null +++ b/src/com/android/settings/accessibility/AccessibilitySearchFeatureProvider.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import android.content.Context; + +import com.android.settingslib.search.SearchIndexableRaw; + +import java.util.List; + +/** + * Provider for Accessibility Search related features. + */ +public interface AccessibilitySearchFeatureProvider { + + /** + * Returns a list of raw data for indexing. See {@link SearchIndexableRaw} + * + * @param context a valid context {@link Context} instance + * @return a list of {@link SearchIndexableRaw} references. Can be null. + */ + List getSearchIndexableRawData(Context context); +} diff --git a/src/com/android/settings/accessibility/AccessibilitySearchFeatureProviderImpl.java b/src/com/android/settings/accessibility/AccessibilitySearchFeatureProviderImpl.java new file mode 100644 index 00000000000..c358af11d06 --- /dev/null +++ b/src/com/android/settings/accessibility/AccessibilitySearchFeatureProviderImpl.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.accessibility; + +import android.content.Context; + +import com.android.settingslib.search.SearchIndexableRaw; + +import java.util.List; + +/** + * Provider implementation for Accessibility Search related features. + */ +public class AccessibilitySearchFeatureProviderImpl implements AccessibilitySearchFeatureProvider { + + @Override + public List getSearchIndexableRawData(Context context) { + return null; + } +} diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index d4db3953f79..78bea0f00a9 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -50,12 +50,14 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.SearchIndexableRaw; import java.util.ArrayList; import java.util.Collection; @@ -494,7 +496,15 @@ public class AccessibilitySettings extends DashboardFragment { } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.accessibility_settings); + new BaseSearchIndexProvider(R.xml.accessibility_settings) { + @Override + public List getRawDataToIndex(Context context, + boolean enabled) { + return FeatureFactory.getFactory(context) + .getAccessibilitySearchFeatureProvider().getSearchIndexableRawData( + context); + } + }; /** * This class helps setup RestrictedPreference. @@ -559,7 +569,6 @@ public class AccessibilitySettings extends DashboardFragment { setRestrictedPreferenceEnabled(preference, packageName, serviceAllowed, serviceEnabled); - final String prefKey = preference.getKey(); final int imageRes = info.getAnimatedImageRes(); final CharSequence description = getServiceDescription(mContext, info, diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java index 58f80fce225..cfdc9eb5b62 100644 --- a/src/com/android/settings/overlay/FeatureFactory.java +++ b/src/com/android/settings/overlay/FeatureFactory.java @@ -23,6 +23,7 @@ import android.util.Log; import androidx.annotation.Nullable; import com.android.settings.R; +import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.GameSettingsFeatureProvider; @@ -174,6 +175,11 @@ public abstract class FeatureFactory { */ public abstract GameSettingsFeatureProvider getGameSettingsFeatureProvider(); + /** + * Retrieve implementation for Accessibility search index feature. + */ + public abstract AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider(); + public static final class FactoryNotFoundException extends RuntimeException { public FactoryNotFoundException(Throwable throwable) { super("Unable to create factory. Did you misconfigure Proguard?", throwable); diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 13b7b604de1..9890a109641 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java @@ -25,6 +25,8 @@ import android.os.UserManager; import androidx.annotation.Keep; +import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; +import com.android.settings.accessibility.AccessibilitySearchFeatureProviderImpl; import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.accounts.AccountFeatureProviderImpl; import com.android.settings.applications.ApplicationFeatureProvider; @@ -106,6 +108,7 @@ public class FeatureFactoryImpl extends FeatureFactory { private ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider; private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider; private GameSettingsFeatureProvider mGameSettingsFeatureProvider; + private AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider; @Override public SupportFeatureProvider getSupportFeatureProvider(Context context) { @@ -335,4 +338,12 @@ public class FeatureFactoryImpl extends FeatureFactory { } return mGameSettingsFeatureProvider; } + + @Override + public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() { + if (mAccessibilitySearchFeatureProvider == null) { + mAccessibilitySearchFeatureProvider = new AccessibilitySearchFeatureProviderImpl(); + } + return mAccessibilitySearchFeatureProvider; + } } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 8c9d6b69bd5..0dcecf71da5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -56,6 +56,7 @@ import com.android.settings.testutils.shadow.ShadowDeviceConfig; import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreference; +import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; import org.junit.Rule; @@ -77,12 +78,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +/** Test for {@link AccessibilitySettings}. */ @RunWith(RobolectricTestRunner.class) public class AccessibilitySettingsTest { private static final String PACKAGE_NAME = "com.android.test"; private static final String CLASS_NAME = PACKAGE_NAME + ".test_a11y_service"; - private static final ComponentName COMPONENT_NAME = new ComponentName(PACKAGE_NAME, - CLASS_NAME); + private static final ComponentName COMPONENT_NAME = new ComponentName(PACKAGE_NAME, CLASS_NAME); private static final int ON = 1; private static final int OFF = 0; private static final String EMPTY_STRING = ""; @@ -132,6 +133,14 @@ public class AccessibilitySettingsTest { assertThat(keys).containsAtLeastElementsIn(niks); } + @Test + public void getRawDataToIndex_isNull() { + final List indexableRawList = + AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true); + + assertThat(indexableRawList).isNull(); + } + @Test @Config(shadows = {ShadowDeviceConfig.class}) public void isRampingRingerEnabled_settingsFlagOn_Enabled() { @@ -362,7 +371,7 @@ public class AccessibilitySettingsTest { try { final AccessibilityServiceInfo info = new AccessibilityServiceInfo(resolveInfo, mContext); - info.setComponentName(new ComponentName(PACKAGE_NAME, CLASS_NAME)); + info.setComponentName(new ComponentName(packageName, className)); return info; } catch (XmlPullParserException | IOException e) { // Do nothing diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index 4c4b922763d..de1af23c6ff 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.when; import android.content.Context; +import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.GameSettingsFeatureProvider; @@ -87,6 +88,7 @@ public class FakeFeatureFactory extends FeatureFactory { public ExtraAppInfoFeatureProvider extraAppInfoFeatureProvider; public SecuritySettingsFeatureProvider securitySettingsFeatureProvider; public GameSettingsFeatureProvider gameSettingsFeatureProvider; + public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider; /** * Call this in {@code @Before} method of the test class to use fake factory. @@ -136,6 +138,7 @@ public class FakeFeatureFactory extends FeatureFactory { extraAppInfoFeatureProvider = mock(ExtraAppInfoFeatureProvider.class); securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class); gameSettingsFeatureProvider = mock(GameSettingsFeatureProvider.class); + mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class); } @Override @@ -272,4 +275,9 @@ public class FakeFeatureFactory extends FeatureFactory { public GameSettingsFeatureProvider getGameSettingsFeatureProvider() { return gameSettingsFeatureProvider; } + + @Override + public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() { + return mAccessibilitySearchFeatureProvider; + } } diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java index 1e74d927109..ba7e0bd02b4 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -19,6 +19,7 @@ import static org.mockito.Mockito.mock; import android.content.Context; +import com.android.settings.accessibility.AccessibilitySearchFeatureProvider; import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.GameSettingsFeatureProvider; @@ -82,6 +83,7 @@ public class FakeFeatureFactory extends FeatureFactory { public ExtraAppInfoFeatureProvider extraAppInfoFeatureProvider; public SecuritySettingsFeatureProvider securitySettingsFeatureProvider; public GameSettingsFeatureProvider gameSettingsFeatureProvider; + public AccessibilitySearchFeatureProvider mAccessibilitySearchFeatureProvider; /** * Call this in {@code @Before} method of the test class to use fake factory. @@ -258,4 +260,9 @@ public class FakeFeatureFactory extends FeatureFactory { public GameSettingsFeatureProvider getGameSettingsFeatureProvider() { return gameSettingsFeatureProvider; } + + @Override + public AccessibilitySearchFeatureProvider getAccessibilitySearchFeatureProvider() { + return mAccessibilitySearchFeatureProvider; + } }