diff --git a/res/drawable/keyboard_arrow_left.xml b/res/drawable/keyboard_arrow_left.xml deleted file mode 100644 index 77a2bfb6046..00000000000 --- a/res/drawable/keyboard_arrow_left.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/drawable/keyboard_arrow_right.xml b/res/drawable/keyboard_arrow_right.xml deleted file mode 100644 index 5b0dd3d27dd..00000000000 --- a/res/drawable/keyboard_arrow_right.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/layout/accessibility_text_reading_preview.xml b/res/layout/accessibility_text_reading_preview.xml index 9c3ce31db22..830d9e66778 100644 --- a/res/layout/accessibility_text_reading_preview.xml +++ b/res/layout/accessibility_text_reading_preview.xml @@ -38,45 +38,20 @@ android:text="@string/screen_zoom_preview_title" style="@style/AccessibilityTextReadingPreviewTitle" /> - + + - - - - - - - + android:layout_gravity="center_horizontal" + android:padding="6dp" + android:visibility="gone" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index f75c0138813..823b87c687c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -78,11 +78,6 @@ Preview - - Previous preview - - Next preview - QR code diff --git a/src/com/android/settings/accessibility/TextReadingPreviewPreference.java b/src/com/android/settings/accessibility/TextReadingPreviewPreference.java index 717da70e49c..9161171914a 100644 --- a/src/com/android/settings/accessibility/TextReadingPreviewPreference.java +++ b/src/com/android/settings/accessibility/TextReadingPreviewPreference.java @@ -22,7 +22,6 @@ import android.os.Parcelable; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import android.widget.ImageButton; import android.widget.LinearLayout; import androidx.preference.Preference; @@ -100,23 +99,6 @@ public class TextReadingPreviewPreference extends Preference { (DotsPageIndicator) holder.findViewById(R.id.page_indicator); updateAdapterIfNeeded(viewPager, pageIndicator, mPreviewAdapter); updatePagerAndIndicator(viewPager, pageIndicator); - viewPager.setClipToOutline(true); - - int layoutDirection = - getContext().getResources().getConfiguration().getLayoutDirection(); - int previousId = (layoutDirection == View.LAYOUT_DIRECTION_RTL) - ? R.id.preview_right_button : R.id.preview_left_button; - int nextId = (layoutDirection == View.LAYOUT_DIRECTION_RTL) - ? R.id.preview_left_button : R.id.preview_right_button; - final ImageButton previousButton = previewLayout.findViewById(previousId); - final ImageButton nextButton = previewLayout.findViewById(nextId); - - previousButton.setOnClickListener((view) -> setCurrentItem(getCurrentItem() - 1)); - previousButton.setContentDescription(getContext().getString( - R.string.preview_pager_previous_button)); - nextButton.setOnClickListener((view) -> setCurrentItem(getCurrentItem() + 1)); - previousButton.setContentDescription(getContext().getString( - R.string.preview_pager_next_button)); } @Override @@ -176,9 +158,7 @@ public class TextReadingPreviewPreference extends Preference { Preconditions.checkNotNull(mPreviewAdapter, "Preview adapter is null, you should init the preview adapter first"); - if (currentItem < 0 || currentItem >= mPreviewAdapter.getCount()) { - return; - } else if (currentItem != mCurrentItem) { + if (currentItem != mCurrentItem) { mCurrentItem = currentItem; notifyChanged(); }