commit 6bb72458f934f00fdfee75323a7919a9f10eba03
author Jeff Brown <jeffbrown@google.com> Wed Sep 08 12:29:49 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 08 12:29:49 2010 -0700
tree 530a14e47927706c63fb45ce7f4953c9538b448c
parent a05088c18d22f822e78e7b91d60f518dc3dc06fc
parent de2f3340d64e20e51029ff438f0d635d97b8a3e0

am de2f3340: Update current.xml for touch filtering feature.

Merge commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp

* commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0':
  Update current.xml for touch filtering feature.

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index 4da6c4b..c706fc2 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -4024,6 +4024,17 @@
  visibility="public"
 >
 </field>
+<field name="filterTouchesWhenObscured"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843460"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="finishOnCloseSystemDialogs"
  type="int"
  transient="false"
@@ -8237,17 +8248,6 @@
  visibility="public"
 >
 </field>
-<field name="securityMode"
- type="int"
- transient="false"
- volatile="false"
- value="16843460"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="seekBarStyle"
  type="int"
  transient="false"
@@ -78450,7 +78450,7 @@
  type="float"
  transient="false"
  volatile="false"
- value="0.001f"
+ value="0.0010f"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -182839,7 +182839,7 @@
  visibility="public"
 >
 </field>
-<field name="FLAG_WINDOW_MAY_BE_OBSCURED"
+<field name="FLAG_WINDOW_IS_OBSCURED"
  type="int"
  transient="false"
  volatile="false"
@@ -185572,6 +185572,17 @@
  visibility="public"
 >
 </method>
+<method name="getFilterTouchesWhenObscured"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getFocusables"
  return="java.util.ArrayList&lt;android.view.View&gt;"
  abstract="false"
@@ -186030,17 +186041,6 @@
  visibility="public"
 >
 </method>
-<method name="getSecurityMode"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="getSolidColor"
  return="int"
  abstract="false"
@@ -187790,6 +187790,19 @@
 <parameter name="length" type="int">
 </parameter>
 </method>
+<method name="setFilterTouchesWhenObscured"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="enabled" type="boolean">
+</parameter>
+</method>
 <method name="setFocusable"
  return="void"
  abstract="false"
@@ -188175,19 +188188,6 @@
 <parameter name="fadeScrollbars" type="boolean">
 </parameter>
 </method>
-<method name="setSecurityMode"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="securityMode" type="int">
-</parameter>
-</method>
 <method name="setSelected"
  return="void"
  abstract="false"
@@ -188968,28 +188968,6 @@
  visibility="public"
 >
 </field>
-<field name="SECURITY_MODE_FILTER_TOUCHES_WHEN_OBSCURED"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="SECURITY_MODE_NORMAL"
- type="int"
- transient="false"
- volatile="false"
- value="0"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="SELECTED_STATE_SET"
  type="int[]"
  transient="false"
@@ -225573,7 +225551,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>