diff options
| author | Mady Mellor <madym@google.com> | 2015-04-22 19:21:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 19:21:36 +0000 |
| commit | 73d74680b707d1f3ef7e3d0a21729501724e98f2 (patch) | |
| tree | 42eba347d3b8ce80abaefeb8317a18fea7a0cf1c | |
| parent | 4fbc845b6877ce5d4a4cd82c9bf784ca1be763b2 (diff) | |
| parent | 7c36a685fea4ee2c93d1dad941061ed3b7c0c566 (diff) | |
| download | frameworks_base-73d74680b707d1f3ef7e3d0a21729501724e98f2.zip frameworks_base-73d74680b707d1f3ef7e3d0a21729501724e98f2.tar.gz frameworks_base-73d74680b707d1f3ef7e3d0a21729501724e98f2.tar.bz2 | |
Merge "Enable stylus scale by default for apps targeting MNC+"
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index 6544c73..b055efe 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -212,9 +212,14 @@ public class ScaleGestureDetector { mMinSpan = res.getDimensionPixelSize(com.android.internal.R.dimen.config_minScalingSpan); mHandler = handler; // Quick scale is enabled by default after JB_MR2 - if (context.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.JELLY_BEAN_MR2) { + final int targetSdkVersion = context.getApplicationInfo().targetSdkVersion; + if (targetSdkVersion > Build.VERSION_CODES.JELLY_BEAN_MR2) { setQuickScaleEnabled(true); } + // Stylus scale is enabled by default after LOLLIPOP_MR1 + if (targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1) { + setStylusScaleEnabled(true); + } } /** |