Fix missing declared accessibility PreferenceControllers.
This includes 3 fixes:
Adds missing settings:controller attribute for bold & high-contrast
text preferences.
Separates VibrationSettings into two fragments, one per fragment XML resource.
Instead of using a conditional to choose the XML resource ID,
we now use the conditional to choose which fragment to launch.
This allows both fragment's preference controllers to be inspected
by CodeInspectionTest#runSliceControllerInXmlInspection.
Also updates the preference keys which must be unique per XML in order
to appear in Settings Search.
Adds Magnification preference controllers to exempt-not-in-XML list.
These controllers are for fragments that are not declared in an XML.
See ToggleScreenMagnificationPreferenceFragment
#getPreferenceScreenResId.
Bug: 289967175
Test: atest SettingsRoboTests:com.android.settings.accessibility
Test: atest CodeInspectionTest#runSliceControllerInXmlInspection;
Observe no errors in the accessibility package.
Test: Open Settings > Accessibility > Vibration & haptics;
observe vibration intensity page is shown (behavior unchanged).
Hardcode config_vibration_supported_intensity_levels=1;
observe vibration page with toggles is shown (behavior unchanged).
Change-Id: I257b5ad390371bedb1623af6289016b06d478707
This commit is contained in:
@@ -26,10 +26,12 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.flags.Flags;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
|
||||
@@ -43,6 +45,9 @@ public class VibrationSettings extends DashboardFragment {
|
||||
private static final String TAG = "VibrationSettings";
|
||||
|
||||
private static int getVibrationXmlResourceId(Context context) {
|
||||
if (Flags.separateAccessibilityVibrationSettingsFragments()) {
|
||||
return R.xml.accessibility_vibration_settings;
|
||||
}
|
||||
final int supportedIntensities = context.getResources().getInteger(
|
||||
R.integer.config_vibration_supported_intensity_levels);
|
||||
return supportedIntensities > 1
|
||||
@@ -74,6 +79,9 @@ public class VibrationSettings extends DashboardFragment {
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
if (Flags.separateAccessibilityVibrationSettingsFragments()) {
|
||||
return super.onCreateView(inflater, container, savedInstanceState);
|
||||
}
|
||||
final View view = super.onCreateView(inflater, container, savedInstanceState);
|
||||
final RecyclerView rv = getListView();
|
||||
final Resources res = view.getResources();
|
||||
@@ -88,12 +96,23 @@ public class VibrationSettings extends DashboardFragment {
|
||||
return view;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
static boolean isPageSearchEnabled(Context context) {
|
||||
final int supportedIntensityLevels = context.getResources().getInteger(
|
||||
R.integer.config_vibration_supported_intensity_levels);
|
||||
final boolean hasVibrator = context.getSystemService(Vibrator.class).hasVibrator();
|
||||
if (Flags.separateAccessibilityVibrationSettingsFragments()) {
|
||||
return hasVibrator && supportedIntensityLevels == 1;
|
||||
} else {
|
||||
return hasVibrator;
|
||||
}
|
||||
}
|
||||
|
||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
|
||||
@Override
|
||||
protected boolean isPageSearchEnabled(Context context) {
|
||||
return context.getSystemService(Vibrator.class).hasVibrator();
|
||||
return VibrationSettings.isPageSearchEnabled(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user