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

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

Merge "Fix suw display size flicker problem" into sc-v2-dev am: 943d6812 am: 579723b4

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

Change-Id: I4454ecfdf367df1c47ac2412d2d75019342d887d
parents 13a0a175 579723b4
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ public class AccessibilityScreenSizeForSetupWizardActivity extends InstrumentedA
        int SCREEN_SIZE = 2;
    }

    // Keep the last height of the scroll view in the {@link GlifLayout}
    private int mLastScrollViewHeight;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -143,11 +146,13 @@ public class AccessibilityScreenSizeForSetupWizardActivity extends InstrumentedA
     * Scrolls to bottom while {@link ScrollView} layout changed.
     */
    private void scrollToBottom() {
        mLastScrollViewHeight = 0;
        final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
        final ScrollView scrollView = layout.getScrollView();
        scrollView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
            final int scrollViewHeight = scrollView.getHeight();
            if (scrollViewHeight > 0) {
            if (scrollViewHeight > 0 && scrollViewHeight != mLastScrollViewHeight) {
                mLastScrollViewHeight = scrollViewHeight;
                scrollView.post(() -> {
                    // Here is no need to show the scrolling animation. So disabled first and
                    // then enabled it after scrolling finished.