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

Commit 60f555cc authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Switch version gate for fallback linespacing to P 

Previously, no version was defined for Android P. Now that
I0a90033239081c583b10021cbc06d032e206beb4 defines it, we can switch
the version gate on the new fallback-based linespacing behavior of
TextView and Switch to it.

Test: bit CtsWidgetTestCases:android.widget.cts.CheckedTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Test: bit CtsWidgetTestCases:android.widget.cts.SwitchTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewTest
Change-Id: Id68ea4b26baa8a632d9f516083a73a0b8879513f
Fixes: 64648475
parent e21e491f

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;