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

Commit af023f24 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Revert "Add an overlayable config for IME switcher visibility." 

This reverts commit fa0e47e0 [1].

Reason for revert: This config is no longer used.

 [1]: Id2aef6597916422ea63435ae9c31a9a9b5ddf5b8

Bug: 26245853
Fix: 135747008
Test: compile
Change-Id: Icdf65be5ddc47fbb8dab225654bad234f16ca644
parent 0b2cb244

core/res/res/values/config.xml

+0 −12
Original line number Diff line number Diff line
@@ -3434,18 +3434,6 @@ 
         TODO: move to input HAL once ready. -->

    <string name="config_doubleTouchGestureEnableFile"></string>



    <!-- Controls how we deal with externally connected physical keyboards.

         0 - When using this device, it is not clear for users to recognize when the physical

             keyboard is (should be) connected and when it is (should be) disconnected.  Most of

             phones and tablets with Bluetooth keyboard would fall into this category because the

             connected Bluetooth keyboard may or may not be nearby the host device.

         1 - When using this device, it is clear for users to recognize when the physical

             keyboard is (should be) connected and when it is (should be) disconnected.

             Devices with wired USB keyboard is one clear example.  Some 2-in-1 convertible

             tablets with dedicated keyboards may have the same affordance to wired USB keyboard.

    -->

    <integer name="config_externalHardKeyboardBehavior">0</integer>



    <!-- Package of the unbundled tv remote service which can connect to tv

         remote provider -->

    <string name="config_tvRemoteServicePackage" translatable="false"></string>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,6 @@ 
  <java-symbol type="integer" name="config_defaultNotificationLedOff" />

  <java-symbol type="integer" name="config_defaultNotificationLedOn" />

  <java-symbol type="integer" name="config_deskDockKeepsScreenOn" />

  <java-symbol type="integer" name="config_externalHardKeyboardBehavior" />

  <java-symbol type="integer" name="config_lightSensorWarmupTime" />

  <java-symbol type="integer" name="config_lowBatteryCloseWarningBump" />

  <java-symbol type="integer" name="config_lowBatteryWarningLevel" />

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

+5 −18
Original line number Diff line number Diff line
@@ -239,13 +239,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            | Context.BIND_SHOWING_UI

            | Context.BIND_SCHEDULE_LIKE_TOP_APP;



    @Retention(SOURCE)

    @IntDef({HardKeyboardBehavior.WIRELESS_AFFORDANCE, HardKeyboardBehavior.WIRED_AFFORDANCE})

    private @interface  HardKeyboardBehavior {

        int WIRELESS_AFFORDANCE = 0;

        int WIRED_AFFORDANCE = 1;

    }



    /**

     * A protected broadcast intent action for internal use for {@link PendingIntent} in

     * the notification.
@@ -689,8 +682,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    private final MyPackageMonitor mMyPackageMonitor = new MyPackageMonitor();

    private final IPackageManager mIPackageManager;

    private final String mSlotIme;

    @HardKeyboardBehavior

    private final int mHardKeyboardBehavior;



    /**

     * Internal state snapshot when {@link #MSG_START_INPUT} message is about to be posted to the
@@ -1465,8 +1456,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        mHasFeature = context.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_INPUT_METHODS);

        mSlotIme = mContext.getString(com.android.internal.R.string.status_bar_ime);

        mHardKeyboardBehavior = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_externalHardKeyboardBehavior);

        mIsLowRam = ActivityManager.isLowRamDeviceStatic();



        Bundle extras = new Bundle();
@@ -2435,13 +2424,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            return false;

        }

        if (mWindowManagerInternal.isHardKeyboardAvailable()) {

            if (mHardKeyboardBehavior == HardKeyboardBehavior.WIRELESS_AFFORDANCE) {

            // When physical keyboard is attached, we show the ime switcher (or notification if

            // NavBar is not available) because SHOW_IME_WITH_HARD_KEYBOARD settings currently

            // exists in the IME switcher dialog.  Might be OK to remove this condition once

            // SHOW_IME_WITH_HARD_KEYBOARD settings finds a good place to live.

            return true;

            }

        } else if ((visibility & InputMethodService.IME_VISIBLE) == 0) {

            return false;

        }