summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2013-09-17 23:57:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-17 23:57:54 +0000
commit09804e41daa31f95a6050892866b24eea32eb4cf (patch)
treee55100fb119852053acb8e68db44e9b6e390c1d6 /api
parentc9d1d5f35091226e96fcfa91817480f589eb36e2 (diff)
parent9f1221f87e4762457c8fa0b4c0e5a291d9aef5c9 (diff)
downloadframeworks_base-09804e41daa31f95a6050892866b24eea32eb4cf.zip
frameworks_base-09804e41daa31f95a6050892866b24eea32eb4cf.tar.gz
frameworks_base-09804e41daa31f95a6050892866b24eea32eb4cf.tar.bz2
Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index e50e57f..cbed2e7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27337,6 +27337,7 @@ package android.view {
method public float getScaleFactor();
method public long getTimeDelta();
method public boolean isInProgress();
+ method public boolean isQuickScaleEnabled();
method public boolean onTouchEvent(android.view.MotionEvent);
method public void setQuickScaleEnabled(boolean);
}