From b1691756e20afb73cc0cf6b54a0628b86542f750 Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Thu, 20 Feb 2025 11:26:35 -0800
Subject: [PATCH] Revert "Left & Right buttons for Display size & text preview"

This reverts commit 30e63f61783d7c12495b41897c8446dd134c0ad0.

Reason for revert: Can cause crash for some users?

Change-Id: I4b4e71157b668bbf4320a610ad14ddd10f2eade3
---
 res/drawable/keyboard_arrow_left.xml          | 19 -------
 res/drawable/keyboard_arrow_right.xml         | 19 -------
 .../accessibility_text_reading_preview.xml    | 51 +++++--------------
 res/values/strings.xml                        |  5 --
 .../TextReadingPreviewPreference.java         | 22 +-------
 5 files changed, 14 insertions(+), 102 deletions(-)
 delete mode 100644 res/drawable/keyboard_arrow_left.xml
 delete mode 100644 res/drawable/keyboard_arrow_right.xml

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2025 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal" android:autoMirrored="true">
-    <path android:fillColor="@android:color/white" android:pathData="M560,720L320,480L560,240L616,296L432,480L616,664L560,720Z"/>
-</vector>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2025 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal" android:autoMirrored="true">
-    <path android:fillColor="@android:color/white" android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z" />
-</vector>
\ 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" />
 
-        <LinearLayout
+        <com.android.settings.accessibility.TextReadingPreviewPager
+            android:id="@+id/preview_pager"
             android:layout_width="match_parent"
+            android:layout_height="217dp"
+            android:contentDescription="@string/preview_pager_content_description"
+            android:nestedScrollingEnabled="true" />
+
+        <com.android.settings.widget.DotsPageIndicator
+            android:id="@+id/page_indicator"
+            style="@style/PreviewPagerPageIndicator"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <com.android.settings.accessibility.TextReadingPreviewPager
-                android:id="@+id/preview_pager"
-                android:layout_width="wrap_content"
-                android:layout_height="217dp"
-                android:contentDescription="@string/preview_pager_content_description"
-                android:nestedScrollingEnabled="true" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_gravity="center_horizontal"
-                android:gravity="center_horizontal">
-                <ImageButton
-                    android:id="@+id/preview_left_button"
-                    android:src="@drawable/keyboard_arrow_left"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_gravity="center_vertical"
-                    style="?android:attr/borderlessButtonStyle" />
-                <com.android.settings.widget.DotsPageIndicator
-                    android:id="@+id/page_indicator"
-                    style="@style/PreviewPagerPageIndicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:padding="6dp"
-                    android:visibility="gone" />
-                <ImageButton
-                    android:id="@+id/preview_right_button"
-                    android:src="@drawable/keyboard_arrow_right"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_gravity="center_vertical"
-                    style="?android:attr/borderlessButtonStyle" />
-            </LinearLayout>
-        </LinearLayout>
+            android:layout_gravity="center_horizontal"
+            android:padding="6dp"
+            android:visibility="gone" />
     </LinearLayout>
 </FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 828e5c3e5aa..c49d6e3f767 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,11 +78,6 @@
 
     <!-- Content description for preview pager. [CHAR LIMIT=NONE] -->
     <string name="preview_pager_content_description">Preview</string>
-    <!-- Previous button for preview pager. [CHAR LIMIT=NONE] -->
-    <string name="preview_pager_previous_button">Previous preview</string>
-    <!-- Next button for preview pager. [CHAR LIMIT=NONE] -->
-    <string name="preview_pager_next_button">Next preview</string>
-
     <!-- Content description for qrcode image. [CHAR LIMIT=none]-->
     <string name="qr_code_content_description">QR code</string>
 
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();
         }