diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-29 15:20:21 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-07-29 15:20:21 -0700 |
| commit | 0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 (patch) | |
| tree | a3ff442ca1aa810866d9a8ba5524764f5150246e /core/java/android/widget | |
| parent | eda1cc50cead674287616e6a852f8f281b70b9f5 (diff) | |
| download | frameworks_base-0e3de6cacaffcfeda4d6353be61e2f1f9ed80705.zip frameworks_base-0e3de6cacaffcfeda4d6353be61e2f1f9ed80705.tar.gz frameworks_base-0e3de6cacaffcfeda4d6353be61e2f1f9ed80705.tar.bz2 | |
Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
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 { |