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

Commit 00255166 authored by Nikolas Havrikov's avatar Nikolas Havrikov Committed by Android (Google) Code Review
Browse files

Merge "Enable preventing IME startup for non-edit views"

parents 7bc21e77 94506d40

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ package android { 
  public static final class R.bool {

    field public static final int config_assistantOnTopOfDream = 17891333; // 0x1110005

    field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004

    field public static final int config_preventImeStartupUnlessTextEditor;

    field public static final int config_remoteInsetsControllerControlsSystemBars = 17891334; // 0x1110006

  }

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2897,6 +2897,10 @@ 
    <!-- Make the IME killable by the lowmemorykiller by raising its oom_score_adj. -->

    <bool name="config_killableInputMethods">false</bool>



    <!-- Prevent the InputMethodManagerService from starting up the IME unless

     the currently focused view is a text editor. -->

    <bool name="config_preventImeStartupUnlessTextEditor">false</bool>



    <!-- The list of classes that should be added to the notification ranking pipeline.

     See {@link com.android.server.notification.NotificationSignalExtractor}

      If you add a new extractor to this list make sure to update

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -3313,6 +3313,8 @@ 
  <staging-public-group type="bool" first-id="0x01cf0000">

    <!-- @hide @SystemApi -->

    <public name="config_systemCaptionsServiceCallsEnabled" />

    <!-- @hide @TestApi -->

    <public name="config_preventImeStartupUnlessTextEditor" />

  </staging-public-group>



  <staging-public-group type="fraction" first-id="0x01ce0000">

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2250,6 +2250,7 @@ 
  <java-symbol type="bool" name="config_autoResetAirplaneMode" />

  <java-symbol type="string" name="config_notificationAccessConfirmationActivity" />

  <java-symbol type="bool" name="config_killableInputMethods" />

  <java-symbol type="bool" name="config_preventImeStartupUnlessTextEditor" />



  <java-symbol type="layout" name="resolver_list" />

  <java-symbol type="id" name="resolver_list" />

services/core/java/com/android/server/inputmethod/InputMethodBindingController.java

+10 −1
Original line number Diff line number Diff line
@@ -510,8 +510,17 @@ final class InputMethodBindingController { 
            return;

        }



        // No IME is currently connected. Reestablish the main connection.

        if (!mHasConnection) {

            if (DEBUG) {

                Slog.d(TAG, "Cannot show input: no IME bound. Rebinding.");

            }

            bindCurrentMethodLocked();

            return;

        }



        long bindingDuration = SystemClock.uptimeMillis() - mLastBindTime;

        if (mHasConnection && bindingDuration >= TIME_TO_RECONNECT) {

        if (bindingDuration >= TIME_TO_RECONNECT) {

            // The client has asked to have the input method shown, but

            // we have been sitting here too long with a connection to the

            // service and no interface received, so let's disconnect/connect