Move the content description for Display size and text preview to xml
Bug: 395882764 Test: atest TextReadingPreviewControllerTest Test: atest TextReadingPreviewPreferenceTest Flag: EXEMPT BUGFIX Change-Id: I070ec2b9b39a205fd3a97636f0c45fb50b670049
This commit is contained in:
@@ -104,13 +104,11 @@ class TextReadingPreviewController extends BasePreferenceController implements
|
||||
final boolean isLayoutRtl =
|
||||
origConfig.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
|
||||
final int[] previewSamples = getPreviewSampleLayouts(mContext);
|
||||
final int[] previewContentDescriptions = getPreviewSampleContentDescriptions(mContext);
|
||||
final PreviewPagerAdapter pagerAdapter = new PreviewPagerAdapter(mContext, isLayoutRtl,
|
||||
previewSamples, createConfig(origConfig));
|
||||
mPreviewPreference.setPreviewAdapter(pagerAdapter);
|
||||
mPreviewPreference.setCurrentItem(
|
||||
isLayoutRtl ? previewSamples.length - 1 : FRAME_INITIAL_INDEX);
|
||||
mPreviewPreference.setContentDescription(previewContentDescriptions);
|
||||
|
||||
final int initialPagerIndex =
|
||||
mLastFontProgress * mDisplaySizeData.getValues().size() + mLastDisplayProgress;
|
||||
@@ -190,20 +188,6 @@ class TextReadingPreviewController extends BasePreferenceController implements
|
||||
return previewSamples;
|
||||
}
|
||||
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||
static int[] getPreviewSampleContentDescriptions(Context context) {
|
||||
TypedArray typedArray = context.getResources().obtainTypedArray(
|
||||
R.array.config_text_reading_preview_content_descriptions);
|
||||
int previewCount = typedArray.length();
|
||||
int[] previewContentDescriptions = new int[previewCount];
|
||||
for (int i = 0; i < previewCount; i++) {
|
||||
previewContentDescriptions[i] =
|
||||
typedArray.getResourceId(i, R.string.preview_pager_content_description);
|
||||
}
|
||||
typedArray.recycle();
|
||||
return previewContentDescriptions;
|
||||
}
|
||||
|
||||
private int getPagerIndex() {
|
||||
final int displayDataSize = mDisplaySizeData.getValues().size();
|
||||
final int fontSizeProgress = mFontSizePreference.getProgress();
|
||||
|
||||
Reference in New Issue
Block a user