summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorMady Mellor <madym@google.com>2015-04-16 12:50:53 -0700
committerMady Mellor <madym@google.com>2015-04-16 12:50:53 -0700
commit6895518d48f265371c26ab4c0d300c3313c4c210 (patch)
tree8ea50693faf36b1c9b9fbb683de4b08dc9db1071 /api/current.txt
parent49cb2775a98727a034c8d709ad7b83990a3d9c8d (diff)
downloadframeworks_base-6895518d48f265371c26ab4c0d300c3313c4c210.zip
frameworks_base-6895518d48f265371c26ab4c0d300c3313c4c210.tar.gz
frameworks_base-6895518d48f265371c26ab4c0d300c3313c4c210.tar.bz2
Remove mouse association in scaling, only do it for stylus, update doc.
Change-Id: I55d1eb8a38bb74f724a36bc6aa0e1a01e734275c
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index c18eafb..e05a63a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -35448,10 +35448,10 @@ package android.view {
method public long getTimeDelta();
method public boolean isInProgress();
method public boolean isQuickScaleEnabled();
- method public boolean isSecondaryButtonScaleEnabled();
+ method public boolean isStylusScaleEnabled();
method public boolean onTouchEvent(android.view.MotionEvent);
method public void setQuickScaleEnabled(boolean);
- method public void setSecondaryButtonScaleEnabled(boolean);
+ method public void setStylusScaleEnabled(boolean);
}
public static abstract interface ScaleGestureDetector.OnScaleGestureListener {