Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb0ca145 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2 am: c6bc7a7c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: I8c1f0b3a19239f85a4f67b53dd703ed7a9d3a625
parents a1c4d9b7 c6bc7a7c

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,7 @@ 


        <activity

            android:name=".accessibility.AccessibilityScreenSizeForSetupWizardActivity"

            android:theme="@android:style/Theme.DeviceDefault.Settings"

            android:exported="false"/>



        <activity

src/com/android/settings/display/PreviewPagerAdapter.java

+0 −4
Original line number Diff line number Diff line
@@ -109,10 +109,6 @@ public class PreviewPagerAdapter extends PagerAdapter { 
        return (view == object);

    }



    FrameLayout[] getPreviewFrames() {

        return mPreviewFrames;

    }



    boolean isAnimating() {

        return mAnimationCounter > 0;

    }

src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java

+0 −6
Original line number Diff line number Diff line
@@ -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);

        }

    };