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

Commit e84ec31a authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 7b5b39d4 3f677b1b

api/current.xml

+125 −0
Original line number Diff line number Diff line
@@ -166341,6 +166341,29 @@ 
<parameter name="event" type="android.view.MotionEvent">

</parameter>

</method>

<method name="setCursorController"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cursorController" type="android.widget.TextView.CursorController">

</parameter>

</method>

<field name="mCursorController"

 type="android.widget.TextView.CursorController"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

</field>

</class>

<class name="BaseKeyListener"

 extends="android.text.method.MetaKeyKeyListener"
@@ -222825,6 +222848,108 @@ 
>

</method>

</class>

<interface name="TextView.CursorController"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="draw"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="canvas" type="android.graphics.Canvas">

</parameter>

</method>

<method name="getOffsetX"

 return="float"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOffsetY"

 return="float"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="hide"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onTouchEvent"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="event" type="android.view.MotionEvent">

</parameter>

</method>

<method name="show"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="updatePosition"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="offset" type="int">

</parameter>

</method>

<field name="FADE_OUT_DURATION"

 type="int"

 transient="false"

 volatile="false"

 value="400"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</interface>

<interface name="TextView.OnEditorActionListener"

 abstract="true"

 static="true"

core/java/android/app/DatePickerDialog.java

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ import java.util.Calendar; 


/**

 * A simple dialog containing an {@link android.widget.DatePicker}.

 *

 * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Date Picker

 * tutorial</a>.</p>

 */

public class DatePickerDialog extends AlertDialog implements OnClickListener, 

        OnDateChangedListener {

core/java/android/app/TimePickerDialog.java

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ import java.util.Calendar; 


/**

 * A dialog that prompts the user for the time of day using a {@link TimePicker}.

 *

 * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Time Picker

 * tutorial</a>.</p>

 */

public class TimePickerDialog extends AlertDialog implements OnClickListener, 

        OnTimeChangedListener {

core/java/android/content/res/TypedArray.java

+1 −3
Original line number Diff line number Diff line
@@ -708,9 +708,7 @@ public class TypedArray { 
        outValue.resourceId = data[index+AssetManager.STYLE_RESOURCE_ID];

        outValue.changingConfigurations = data[index+AssetManager.STYLE_CHANGING_CONFIGURATIONS];

        outValue.density = data[index+AssetManager.STYLE_DENSITY];

        if (type == TypedValue.TYPE_STRING) {

            outValue.string = loadStringValueAt(index);

        }

        outValue.string = (type == TypedValue.TYPE_STRING) ? loadStringValueAt(index) : null;

        return true;

    }

core/java/android/text/Selection.java

+2 −2
Original line number Diff line number Diff line
@@ -417,8 +417,8 @@ public class Selection { 
        }

    }



    private static final class START implements NoCopySpan { };

    private static final class END implements NoCopySpan { };

    private static final class START implements NoCopySpan { }

    private static final class END implements NoCopySpan { }

    

    /*

     * Public constants