Makes Use Color inversion searchable.
Fix: 354773587
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Test: atest ToggleColorInversionPreferenceFragmentTest
Test: adb shell pm clear com.google.android.settings.intelligence;
search Settings for 'use color inversion', observe 'use color inversion' present;
Change-Id: Iad13fbe163002af6e84a79fdeafb8517d53e2b09
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index ccba9e7f..24aae3f 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -33,6 +33,8 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -52,7 +54,10 @@
private static final String TAG = "ToggleColorInversionPreferenceFragment";
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
- private static final String KEY_SHORTCUT_PREFERENCE = "color_inversion_shortcut_key";
+ @VisibleForTesting
+ static final String KEY_SHORTCUT_PREFERENCE = "color_inversion_shortcut_key";
+ @VisibleForTesting
+ static final String KEY_SWITCH_PREFERENCE = "color_inversion_switch_preference_key";
@Override
protected void registerKeysToObserverCallback(
@@ -73,9 +78,9 @@
mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
mTopIntroTitle = getText(R.string.accessibility_display_inversion_preference_intro_text);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
- .authority(getPrefContext().getPackageName())
- .appendPath(String.valueOf(R.raw.a11y_color_inversion_banner))
- .build();
+ .authority(getPrefContext().getPackageName())
+ .appendPath(String.valueOf(R.raw.a11y_color_inversion_banner))
+ .build();
final View view = super.onCreateView(inflater, container, savedInstanceState);
updateFooterPreference();
return view;
@@ -132,6 +137,11 @@
}
@Override
+ protected String getUseServicePreferenceKey() {
+ return KEY_SWITCH_PREFERENCE;
+ }
+
+ @Override
protected CharSequence getShortcutTitle() {
return getText(R.string.accessibility_display_inversion_shortcut_title);
}
@@ -165,7 +175,7 @@
@Override
int getUserShortcutTypes() {
return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
- mComponentName);
+ mComponentName);
}
@Override
@@ -176,8 +186,8 @@
@Override
CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {
return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT
- ? R.string.accessibility_color_inversion_qs_tooltip_content
- : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);
+ ? R.string.accessibility_color_inversion_qs_tooltip_content
+ : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);
}
@Override
@@ -194,12 +204,22 @@
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context,
boolean enabled) {
- final List<SearchIndexableRaw> rawData = new ArrayList<>();
+ final List<SearchIndexableRaw> rawData =
+ super.getRawDataToIndex(context, enabled);
+
SearchIndexableRaw raw = new SearchIndexableRaw(context);
raw.key = KEY_SHORTCUT_PREFERENCE;
raw.title = context.getString(
- R.string.accessibility_display_inversion_shortcut_title);
+ R.string.accessibility_display_inversion_shortcut_title);
rawData.add(raw);
+
+ if (Flags.fixA11ySettingsSearch()) {
+ SearchIndexableRaw mainPreferenceRaw = new SearchIndexableRaw(context);
+ mainPreferenceRaw.key = KEY_SWITCH_PREFERENCE;
+ mainPreferenceRaw.title = context.getString(
+ R.string.accessibility_display_inversion_switch_title);
+ rawData.add(mainPreferenceRaw);
+ }
return rawData;
}
};
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
index eb2e6fd..e971186 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
@@ -18,6 +18,8 @@
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_SHORTCUT_PREFERENCE;
+import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_SWITCH_PREFERENCE;
import static com.google.common.truth.Truth.assertThat;
@@ -31,12 +33,12 @@
import android.content.Context;
import android.os.Bundle;
import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.accessibility.Flags;
import android.widget.PopupWindow;
import androidx.fragment.app.FragmentActivity;
@@ -49,6 +51,7 @@
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.SettingsMainSwitchPreference;
+import com.android.settingslib.search.SearchIndexableRaw;
import org.junit.Before;
import org.junit.Rule;
@@ -62,6 +65,7 @@
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
+import java.util.ArrayList;
import java.util.List;
/** Tests for {@link ToggleColorInversionPreferenceFragment} */
@@ -136,7 +140,7 @@
}
@Test
- @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+ @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, OFF);
@@ -198,6 +202,41 @@
assertThat(keys).containsAtLeastElementsIn(niks);
}
+ @Test
+ @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+ public void getRawDataToIndex_flagOff_returnShortcutIndexablePreferences() {
+ List<SearchIndexableRaw> rawData = ToggleColorInversionPreferenceFragment
+ .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+ assertThat(rawData).hasSize(1);
+ assertThat(rawData.get(0).key).isEqualTo(KEY_SHORTCUT_PREFERENCE);
+ assertThat(rawData.get(0).title).isEqualTo(mContext.getString(
+ R.string.accessibility_display_inversion_shortcut_title));
+
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+ public void getRawDataToIndex_flagOn_returnAllIndexablePreferences() {
+ String[] expectedKeys = {KEY_SHORTCUT_PREFERENCE, KEY_SWITCH_PREFERENCE};
+ String[] expectedTitles = {
+ mContext.getString(R.string.accessibility_display_inversion_shortcut_title),
+ mContext.getString(R.string.accessibility_display_inversion_switch_title)};
+ List<String> keysResultList = new ArrayList<>();
+ List<String> titlesResultList = new ArrayList<>();
+ List<SearchIndexableRaw> rawData = ToggleColorInversionPreferenceFragment
+ .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+ for (SearchIndexableRaw rawDataItem : rawData) {
+ keysResultList.add(rawDataItem.key);
+ titlesResultList.add(rawDataItem.title);
+ }
+
+ assertThat(rawData).hasSize(2);
+ assertThat(keysResultList).containsExactly(expectedKeys);
+ assertThat(titlesResultList).containsExactly(expectedTitles);
+ }
+
private static PopupWindow getLatestPopupWindow() {
final ShadowApplication shadowApplication =
Shadow.extract(ApplicationProvider.getApplicationContext());