diff options
| author | Adam Powell <adamp@google.com> | 2010-10-05 16:46:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 16:46:05 -0700 |
| commit | ee7e0efcc1314b994ba70d91f6e8fa951044c916 (patch) | |
| tree | 2b6e45903190cb26c1af272cda6cd2cdd8cbcdd1 /api | |
| parent | 65e8b476245255a96faaa70872a4196763a95e10 (diff) | |
| parent | 59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8 (diff) | |
| download | frameworks_base-ee7e0efcc1314b994ba70d91f6e8fa951044c916.zip frameworks_base-ee7e0efcc1314b994ba70d91f6e8fa951044c916.tar.gz frameworks_base-ee7e0efcc1314b994ba70d91f6e8fa951044c916.tar.bz2 | |
am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp
* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/api/current.xml b/api/current.xml index c4c19c9..9791d82 100644 --- a/api/current.xml +++ b/api/current.xml @@ -6895,7 +6895,7 @@ visibility="public" > </field> -<field name="overscrollFooter" +<field name="overScrollFooter" type="int" transient="false" volatile="false" @@ -6906,7 +6906,7 @@ visibility="public" > </field> -<field name="overscrollHeader" +<field name="overScrollHeader" type="int" transient="false" volatile="false" @@ -6917,7 +6917,7 @@ visibility="public" > </field> -<field name="overscrollMode" +<field name="overScrollMode" type="int" transient="false" volatile="false" @@ -187697,7 +187697,7 @@ visibility="public" > </method> -<method name="getOverscrollMode" +<method name="getOverScrollMode" return="int" abstract="false" native="false" @@ -188861,7 +188861,7 @@ <parameter name="heightMeasureSpec" type="int"> </parameter> </method> -<method name="onOverscrolled" +<method name="onOverScrolled" return="void" abstract="false" native="false" @@ -189033,7 +189033,7 @@ <parameter name="visibility" type="int"> </parameter> </method> -<method name="overscrollBy" +<method name="overScrollBy" return="boolean" abstract="false" native="false" @@ -189055,9 +189055,9 @@ </parameter> <parameter name="scrollRangeY" type="int"> </parameter> -<parameter name="maxOverscrollX" type="int"> +<parameter name="maxOverScrollX" type="int"> </parameter> -<parameter name="maxOverscrollY" type="int"> +<parameter name="maxOverScrollY" type="int"> </parameter> <parameter name="isTouchEvent" type="boolean"> </parameter> @@ -189901,7 +189901,7 @@ <parameter name="l" type="android.view.View.OnTouchListener"> </parameter> </method> -<method name="setOverscrollMode" +<method name="setOverScrollMode" return="void" abstract="false" native="false" @@ -189911,7 +189911,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="overscrollMode" type="int"> +<parameter name="overScrollMode" type="int"> </parameter> </method> <method name="setPadding" @@ -190536,7 +190536,7 @@ visibility="public" > </field> -<field name="OVERSCROLL_ALWAYS" +<field name="OVER_SCROLL_ALWAYS" type="int" transient="false" volatile="false" @@ -190547,7 +190547,7 @@ visibility="public" > </field> -<field name="OVERSCROLL_IF_CONTENT_SCROLLS" +<field name="OVER_SCROLL_IF_CONTENT_SCROLLS" type="int" transient="false" volatile="false" @@ -190558,7 +190558,7 @@ visibility="public" > </field> -<field name="OVERSCROLL_NEVER" +<field name="OVER_SCROLL_NEVER" type="int" transient="false" volatile="false" @@ -217777,7 +217777,7 @@ visibility="public" > </method> -<method name="isOverscrolled" +<method name="isOverScrolled" return="boolean" abstract="false" native="false" @@ -217822,7 +217822,7 @@ <parameter name="overY" type="int"> </parameter> </method> -<method name="springback" +<method name="springBack" return="boolean" abstract="false" native="false" |