Merge "Hide color mode in search during A11y" into qt-r1-dev am: 9eaf5de974

am: f43839da91

Change-Id: Iace1bdf9a10c85ed9e04ae2d8425f79f42606233
This commit is contained in:
Anthony Han
2019-06-10 17:53:21 -07:00
committed by android-build-merger

View File

@@ -218,7 +218,8 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment {
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
final int[] availableColorModes = context.getResources().getIntArray( final int[] availableColorModes = context.getResources().getIntArray(
com.android.internal.R.array.config_availableColorModes); com.android.internal.R.array.config_availableColorModes);
return availableColorModes != null && availableColorModes.length > 0; return availableColorModes != null && availableColorModes.length > 0
&& !ColorDisplayManager.areAccessibilityTransformsEnabled(context);
} }
}; };
} }