From 644a2b9bc6278cf3d73d25d87f965f5355fb1892 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Sat, 20 Nov 2021 17:58:23 +0800
Subject: [PATCH] Fix overlapped problem in SuW two panes mode

- The previous preview page will overlap the right pane in RTL language.
- The root cause is the false value of the clipToPadding and
  clipChildren.
- Use the TTheme.DeviceDefault.Settings.

Fixes: 204955818
Test: manual test
Change-Id: I75c7f419cf93ebe9c4e9e3cb24835163a6b01e11
---
 AndroidManifest.xml                                         | 1 +
 src/com/android/settings/display/PreviewPagerAdapter.java   | 4 ----
 .../settings/display/PreviewSeekBarPreferenceFragment.java  | 6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ffac933aca0..67f74be1dc2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1882,6 +1882,7 @@
 
         <activity
             android:name=".accessibility.AccessibilityScreenSizeForSetupWizardActivity"
+            android:theme="@android:style/Theme.DeviceDefault.Settings"
             android:exported="false"/>
 
         <activity
diff --git a/src/com/android/settings/display/PreviewPagerAdapter.java b/src/com/android/settings/display/PreviewPagerAdapter.java
index a424b1da84e..018be326d1b 100644
--- a/src/com/android/settings/display/PreviewPagerAdapter.java
+++ b/src/com/android/settings/display/PreviewPagerAdapter.java
@@ -109,10 +109,6 @@ public class PreviewPagerAdapter extends PagerAdapter {
         return (view == object);
     }
 
-    FrameLayout[] getPreviewFrames() {
-        return mPreviewFrames;
-    }
-
     boolean isAnimating() {
         return mAnimationCounter > 0;
     }
diff --git a/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
index c6d5b8b44a9..abd14d25d9e 100644
--- a/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
+++ b/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
@@ -264,12 +264,6 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc
         @Override
         public void onPageSelected(int position) {
             mPreviewPager.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT);
-            // To avoid displaying previous page on the left side in SUW landscape mode for
-            // large size.
-            if (position > 0) {
-                mPreviewPagerAdapter.getPreviewFrames()[position - 1].setVisibility(View.INVISIBLE);
-            }
-            mPreviewPagerAdapter.getPreviewFrames()[position].setVisibility(View.VISIBLE);
         }
     };