Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d01f23 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Expose split touch API on PopupWindow."

parents b0ceba17 2e976df6

api/current.xml

+32 −8
Original line number Diff line number Diff line
@@ -241251,6 +241251,17 @@ 
 visibility="public"

>

</method>

<method name="isSplitTouchEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isTouchable"

 return="boolean"

 abstract="false"
@@ -241403,6 +241414,19 @@ 
<parameter name="mode" type="int">

</parameter>

</method>

<method name="setSplitTouchEnabled"

 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="setTouchInterceptor"

 return="void"

 abstract="false"
@@ -347485,7 +347509,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347496,7 +347520,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347522,7 +347546,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347537,7 +347561,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347571,7 +347595,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347586,7 +347610,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347773,7 +347797,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>
@@ -347814,7 +347838,7 @@ 
 native="false"

 synchronized="false"

 static="true"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

core/java/android/widget/PopupWindow.java

+0 −2
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ public class PopupWindow { 
     * @return true if the touch splitting is enabled, false otherwise

     * 

     * @see #setSplitTouchEnabled(boolean)

     * @hide

     */

    public boolean isSplitTouchEnabled() {

        if (mSplitTouchEnabled < 0 && mContext != null) {
@@ -621,7 +620,6 @@ public class PopupWindow { 
     *

     * @param enabled true if the split touches should be enabled, false otherwise

     * @see #isSplitTouchEnabled()

     * @hide

     */

    public void setSplitTouchEnabled(boolean enabled) {

        mSplitTouchEnabled = enabled ? 1 : 0;