Merge "Fix the preview couldn't be scrolled up and down when showing the scroll bar."

This commit is contained in:
PETER LIANG
2022-12-13 05:50:51 +00:00
committed by Android (Google) Code Review
3 changed files with 81 additions and 27 deletions

View File

@@ -37,7 +37,7 @@
android:text="@string/screen_zoom_preview_title"
style="@style/AccessibilityTextReadingPreviewTitle" />
<androidx.viewpager.widget.ViewPager
<com.android.settings.accessibility.TextReadingPreviewPager
android:id="@+id/preview_pager"
android:layout_width="match_parent"
android:layout_height="217dp"

View File

@@ -15,7 +15,14 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:importantForAccessibility="noHideDescendants">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -37,7 +44,7 @@
android:paddingTop="11dp"
android:textSize="12sp"
android:text="@string/accessibility_text_reading_preview_mail_from"
android:textColor="?android:attr/textColorSecondary" />
android:textColor="?android:attr/textColorSecondary"/>
<TextView
android:id="@+id/content"
@@ -46,4 +53,5 @@
android:textSize="13sp"
android:text="@string/accessibility_text_reading_preview_mail_content"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View File

@@ -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);
}
}