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

Commit af753780 authored by Aaron Echols's avatar Aaron Echols Committed by Rick C
Browse files

Port "Add resource to disable the CM Phone IME selector method" 

Change-Id: I6fb482e227bf1de4799923cc952d4e3c8ad0d037
parent 17cbe6c3

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1045,4 +1045,7 @@ 
    <!-- Workaround for devices with broken keyboards -->

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



    <!-- Setting to false will disable CM's IME switcher implementation for tablets -->

    <bool name="config_show_cmIMESwitcher">true</bool>



</resources>

core/res/res/values/symbols.xml

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

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

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

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



  <!-- Notification and battery light -->

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

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

+8 −2
Original line number Diff line number Diff line
@@ -1611,8 +1611,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            mCurMethodId = null;

            unbindCurrentMethodLocked(true, false);

        }

        // code to disable the CM Phone IME switcher with config_show_cmIMESwitcher set = false

        try {

            mShowOngoingImeSwitcherForPhones = Settings.System.getInt(mContext.getContentResolver(),

               Settings.System.STATUS_BAR_IME_SWITCHER, 1) == 1;

            Settings.System.STATUS_BAR_IME_SWITCHER) == 1;

        } catch (SettingNotFoundException e) {

            mShowOngoingImeSwitcherForPhones = mRes.getBoolean(

            com.android.internal.R.bool.config_show_cmIMESwitcher);

        }

    }



    /* package */ void setInputMethodLocked(String id, int subtypeId) {