diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-09-21 22:08:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-21 22:08:02 +0000 |
| commit | e3c34ce40094a3687f90b8173e1abc5f46855bc0 (patch) | |
| tree | a153d74f5e752ab999512390287926198e9210d8 /core/java/android | |
| parent | 1123fac2d1ed8e3337bfb244a3aeee9066d02a98 (diff) | |
| parent | 60f555cca8e8eef088bcf4aff066e93f0f8eb4f9 (diff) | |
Merge "Switch version gate for fallback linespacing to P"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/Switch.java | 5 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 2e1e96365f2a..604575fae463 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -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); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 2de552777756..791a8fae418f 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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; |