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:
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Bundle;
|
||||
import android.os.Vibrator;
|
||||
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;
|
||||
|
||||
/** Accessibility settings for the vibration. */
|
||||
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
|
||||
public class VibrationIntensitySettingsFragment extends DashboardFragment {
|
||||
|
||||
private static final String TAG = "VibrationIntensitySettings";
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return SettingsEnums.ACCESSIBILITY_VIBRATION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHelpResource() {
|
||||
return R.string.help_uri_accessibility_vibration;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
return R.xml.accessibility_vibration_intensity_settings;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@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 false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
final View view = super.onCreateView(inflater, container, savedInstanceState);
|
||||
final Resources res = view.getResources();
|
||||
final RecyclerView rv = getListView();
|
||||
if (rv != null) {
|
||||
final int bottom_padding = res.getDimensionPixelSize(
|
||||
com.android.settingslib.widget.theme.R.dimen
|
||||
.settingslib_listPreferredItemPaddingEnd);
|
||||
rv.setPaddingRelative(rv.getPaddingStart(), rv.getPaddingTop(), rv.getPaddingEnd(),
|
||||
rv.getPaddingBottom() + bottom_padding);
|
||||
}
|
||||
return view;
|
||||
}
|
||||
|
||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider(R.xml.accessibility_vibration_intensity_settings) {
|
||||
@Override
|
||||
protected boolean isPageSearchEnabled(Context context) {
|
||||
return VibrationIntensitySettingsFragment.isPageSearchEnabled(context);
|
||||
}
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user