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

Commit 00483559 authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android Git Automerger
Browse files

am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 

* commit 'a8a4ce97':
  Add a config for whether to start in touch mode.
parents b9470f3a a8a4ce97

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2021,4 +2021,7 @@ 


    <!-- Use ERI text for network name on CDMA LTE -->

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



    <!-- Whether to start in touch mode -->

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

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2155,4 +2155,5 @@ 


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

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

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

</resources>

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ public class WindowManagerService extends IWindowManager.Stub 
     * Whether the UI is currently running in touch mode (not showing

     * navigational focus because the user is directly pressing the screen).

     */

    boolean mInTouchMode = true;

    boolean mInTouchMode;



    private ViewServer mViewServer;

    private final ArrayList<WindowChangeListener> mWindowChangeListeners =
@@ -825,6 +825,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                com.android.internal.R.bool.config_sf_limitedAlpha);

        mHasPermanentDpad = context.getResources().getBoolean(

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

        mInTouchMode = context.getResources().getBoolean(

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

        mInputManager = inputManager; // Must be before createDisplayContentLocked.

        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);

        mDisplaySettings = new DisplaySettings();