diff --git a/res/layout/accessibility_text_reading_preview.xml b/res/layout/accessibility_text_reading_preview.xml index 91fb0a00486..4b70bb40b6c 100644 --- a/res/layout/accessibility_text_reading_preview.xml +++ b/res/layout/accessibility_text_reading_preview.xml @@ -37,7 +37,7 @@ android:text="@string/screen_zoom_preview_title" style="@style/AccessibilityTextReadingPreviewTitle" /> - - + android:layout_height="match_parent" + android:fillViewport="true" + android:importantForAccessibility="noHideDescendants"> - + android:orientation="vertical"> - + - - + + + + + diff --git a/src/com/android/settings/accessibility/TextReadingPreviewPager.java b/src/com/android/settings/accessibility/TextReadingPreviewPager.java new file mode 100644 index 00000000000..5d431593d06 --- /dev/null +++ b/src/com/android/settings/accessibility/TextReadingPreviewPager.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2022 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.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; + +/** + * The view pager is used for displaying screen preview with different size configuration changes. + */ +public class TextReadingPreviewPager extends ViewPager { + public TextReadingPreviewPager(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + final ViewGroup parent = (ViewGroup) getParent(); + if (parent != null) { + // Avoid conflicting with the nested scroll view. + parent.requestDisallowInterceptTouchEvent(true); + } + + return super.onInterceptTouchEvent(ev); + } +}