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

Commit 77b7c33a authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Don't save ScrollView/HorizontalScrollView saved state for old apps"

parents d1f9aaa5 90f339a5

core/java/android/widget/HorizontalScrollView.java

+13 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.os.Build;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;
@@ -1641,6 +1642,12 @@ public class HorizontalScrollView extends FrameLayout { 


    @Override

    protected void onRestoreInstanceState(Parcelable state) {

        if (mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.JELLY_BEAN_MR2) {

            // Some old apps reused IDs in ways they shouldn't have.

            // Don't break them, but they don't get scroll state restoration.

            super.onRestoreInstanceState(state);

            return;

        }

        SavedState ss = (SavedState) state;

        super.onRestoreInstanceState(ss.getSuperState());

        mSavedState = ss;
@@ -1649,6 +1656,11 @@ public class HorizontalScrollView extends FrameLayout { 


    @Override

    protected Parcelable onSaveInstanceState() {

        if (mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.JELLY_BEAN_MR2) {

            // Some old apps reused IDs in ways they shouldn't have.

            // Don't break them, but they don't get scroll state restoration.

            return super.onSaveInstanceState();

        }

        Parcelable superState = super.onSaveInstanceState();

        SavedState ss = new SavedState(superState);

        ss.scrollPosition = mScrollX;

core/java/android/widget/ScrollView.java

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.widget;



import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

import com.android.internal.R;
@@ -1662,6 +1663,12 @@ public class ScrollView extends FrameLayout { 


    @Override

    protected void onRestoreInstanceState(Parcelable state) {

        if (mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.JELLY_BEAN_MR2) {

            // Some old apps reused IDs in ways they shouldn't have.

            // Don't break them, but they don't get scroll state restoration.

            super.onRestoreInstanceState(state);

            return;

        }

        SavedState ss = (SavedState) state;

        super.onRestoreInstanceState(ss.getSuperState());

        mSavedState = ss;
@@ -1670,6 +1677,11 @@ public class ScrollView extends FrameLayout { 


    @Override

    protected Parcelable onSaveInstanceState() {

        if (mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.JELLY_BEAN_MR2) {

            // Some old apps reused IDs in ways they shouldn't have.

            // Don't break them, but they don't get scroll state restoration.

            return super.onSaveInstanceState();

        }

        Parcelable superState = super.onSaveInstanceState();

        SavedState ss = new SavedState(superState);

        ss.scrollPosition = mScrollY;