summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mady Mellor <madym@google.com> 2015-06-05 15:50:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-06-05 15:50:52 +0000
commit0f2f9f7a51a43ef8ca1d977f62cf649d08d6ec84 (patch)
tree0b72f86973783599e626af267b35cf441ad3f357
parente790c97787dbc05930ad0c4a708fad7cd7d3f2b9 (diff)
parentd9ff4df850e9e22915d09047c953765c84dcfb84 (diff)
Merge "Stylus scale - API review feedback" into mnc-dev
-rw-r--r--core/java/android/view/ScaleGestureDetector.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java
index 7b0f1fbe7ee1..37e400014781 100644
--- a/core/java/android/view/ScaleGestureDetector.java
+++ b/core/java/android/view/ScaleGestureDetector.java
@@ -516,8 +516,8 @@ public class ScaleGestureDetector {
}
/**
- * Return whether the stylus scale gesture, in which the user uses a stylus
- * and presses the button, should preform scaling. {@see #setButtonScaleEnabled(boolean)}.
+ * Return whether the stylus scale gesture, in which the user uses a stylus and presses the
+ * button, should perform scaling. {@see #setStylusScaleEnabled(boolean)}
*/
public boolean isStylusScaleEnabled() {
return mStylusScaleEnabled;