diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 17:11:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 17:11:58 +0000 |
| commit | c1836bb0f1bf3e5ef0911719525da0bab3e53507 (patch) | |
| tree | 616e87b836bf7dc35558971d19743a467e4e665f /core/java/android/widget | |
| parent | d0694da4fb85bb01e7c0ea7989a78a0e635453ac (diff) | |
| parent | 0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 (diff) | |
| download | frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.zip frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.gz frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.bz2 | |
Merge "Change MNC codename to just M." into mnc-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 58a94b9..529d295 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -356,7 +356,7 @@ public class ScrollView extends FrameLayout { final int heightPadding; final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams(); final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion; - if (targetSdkVersion >= VERSION_CODES.MNC) { + if (targetSdkVersion >= VERSION_CODES.M) { widthPadding = mPaddingLeft + mPaddingRight + lp.leftMargin + lp.rightMargin; heightPadding = mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin; } else { |