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

Commit 51bf0778 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Open Source Project
Browse files

Automated import from //branches/master/...@141004,141004

parent 36197e77

api/current.xml

+16 −1
Original line number Diff line number Diff line
@@ -135270,7 +135270,7 @@ 
>

<parameter name="targetView" type="android.view.View">

</parameter>

<parameter name="dummyMode" type="boolean">

<parameter name="fullEditor" type="boolean">

</parameter>

</constructor>

<method name="beginBatchEdit"
@@ -136700,6 +136700,8 @@ 
>

<parameter name="target" type="android.view.inputmethod.InputConnection">

</parameter>

<parameter name="mutable" type="boolean">

</parameter>

</constructor>

<method name="beginBatchEdit"

 return="boolean"
@@ -136945,6 +136947,19 @@ 
<parameter name="end" type="int">

</parameter>

</method>

<method name="setTarget"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="target" type="android.view.inputmethod.InputConnection">

</parameter>

</method>

</class>

<interface name="InputMethod"

 abstract="true"

core/java/android/app/ApplicationContext.java

+2 −4
Original line number Diff line number Diff line
@@ -2723,10 +2723,8 @@ class ApplicationContext extends Context { 
                    mTimestamp = mFileStatus.mtime;

                }

                

                // Writing was successful, delete the backup file

                if (!mBackupFile.delete()) {

                    Log.e(TAG, "Couldn't delete new backup file " + mBackupFile);

                }

                // Writing was successful, delete the backup file if there is one.

                mBackupFile.delete();

                return true;

            } catch (XmlPullParserException e) {

                Log.w(TAG, "writeFileLocked: Got exception:", e);

core/java/android/view/inputmethod/BaseInputConnection.java

+5 −8
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ public class BaseInputConnection implements InputConnection { 
    static final Object COMPOSING = new ComposingText();

    

    final InputMethodManager mIMM;

    final Handler mH;

    final View mTargetView;

    final boolean mDummyMode;
@@ -60,19 +59,17 @@ public class BaseInputConnection implements InputConnection { 
    Editable mEditable;

    KeyCharacterMap mKeyCharacterMap;

    

    BaseInputConnection(InputMethodManager mgr, boolean dummyMode) {

    BaseInputConnection(InputMethodManager mgr, boolean fullEditor) {

        mIMM = mgr;

        mTargetView = null;

        mH = null;

        mDummyMode = dummyMode;

        mDummyMode = !fullEditor;

    }

    

    public BaseInputConnection(View targetView, boolean dummyMode) {

    public BaseInputConnection(View targetView, boolean fullEditor) {

        mIMM = (InputMethodManager)targetView.getContext().getSystemService(

                Context.INPUT_METHOD_SERVICE);

        mH = targetView.getHandler();

        mTargetView = targetView;

        mDummyMode = dummyMode;

        mDummyMode = !fullEditor;

    }

    

    public static final void removeComposingSpans(Spannable text) {
@@ -403,7 +400,7 @@ public class BaseInputConnection implements InputConnection { 
     */

    public boolean sendKeyEvent(KeyEvent event) {

        synchronized (mIMM.mH) {

            Handler h = mH;

            Handler h = mTargetView != null ? mTargetView.getHandler() : null;

            if (h == null) {

                if (mIMM.mServedView != null) {

                    h = mIMM.mServedView.getHandler();

core/java/android/view/inputmethod/InputConnectionWrapper.java

+14 −2
Original line number Diff line number Diff line
@@ -24,9 +24,21 @@ import android.view.KeyEvent; 
 * and have fun!

 */

public class InputConnectionWrapper implements InputConnection {

    private final InputConnection mTarget;

    private InputConnection mTarget;

    final boolean mMutable;

    

    public InputConnectionWrapper(InputConnection target) {

    public InputConnectionWrapper(InputConnection target, boolean mutable) {

        mMutable = mutable;

        mTarget = target;

    }



    /**

     * Change the target of the input connection.

     */

    public void setTarget(InputConnection target) {

        if (mTarget != null && !mMutable) {

            throw new SecurityException("not mutable");

        }

        mTarget = target;

    }

core/java/android/view/inputmethod/InputMethodManager.java

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ import java.util.concurrent.TimeUnit; 
 * </ul>

 */

public final class InputMethodManager {

    static final boolean DEBUG = false;

    static final boolean DEBUG = true;

    static final String TAG = "InputMethodManager";



    static final Object mInstanceSync = new Object();
@@ -426,7 +426,7 @@ public final class InputMethodManager { 
        }

    };    

    

    final InputConnection mDummyInputConnection = new BaseInputConnection(this, true);

    final InputConnection mDummyInputConnection = new BaseInputConnection(this, false);

    

    InputMethodManager(IInputMethodManager service, Looper looper) {

        mService = service;