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

Commit cd8a01d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev

parents a8c97980 644a2b9b

AndroidManifest.xml

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

        }

    };