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

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

Merge "Switch version gate for fallback linespacing to P"

parents 1123fac2 60f555cc

core/java/android/widget/Switch.java

+1 −4
Original line number Diff line number Diff line
@@ -248,10 +248,7 @@ public class Switch extends CompoundButton { 
                com.android.internal.R.styleable.Switch_switchPadding, 0);

        mSplitTrack = a.getBoolean(com.android.internal.R.styleable.Switch_splitTrack, false);



        // TODO: replace CUR_DEVELOPMENT with P once P is added to android.os.Build.VERSION_CODES.

        // STOPSHIP if the above TODO is not done.

        mUseFallbackLineSpacing =

                context.getApplicationInfo().targetSdkVersion >= VERSION_CODES.CUR_DEVELOPMENT;

        mUseFallbackLineSpacing = context.getApplicationInfo().targetSdkVersion >= VERSION_CODES.P;



        ColorStateList thumbTintList = a.getColorStateList(

                com.android.internal.R.styleable.Switch_thumbTint);

core/java/android/widget/TextView.java

+1 −3
Original line number Diff line number Diff line
@@ -1256,9 +1256,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        final int targetSdkVersion = context.getApplicationInfo().targetSdkVersion;

        mUseInternationalizedInput = targetSdkVersion >= VERSION_CODES.O;

        // TODO: replace CUR_DEVELOPMENT with P once P is added to android.os.Build.VERSION_CODES.

        // STOPSHIP if the above TODO is not done.

        mUseFallbackLineSpacing = targetSdkVersion >= VERSION_CODES.CUR_DEVELOPMENT;

        mUseFallbackLineSpacing = targetSdkVersion >= VERSION_CODES.P;



        if (inputMethod != null) {

            Class<?> c;