summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2015-01-21 15:43:07 -0800
committerTim Kilbourn <tkilbourn@google.com>2015-01-27 13:51:58 -0800
commit96268545435c30d628b3644830d9e054d575d8c9 (patch)
treece630e16dc64611f07f372ff176d4bdba1316509 /services
parentbe3731f028cf815d51e7c49b7415d7d1e8ac3639 (diff)
downloadframeworks_base-96268545435c30d628b3644830d9e054d575d8c9.zip
frameworks_base-96268545435c30d628b3644830d9e054d575d8c9.tar.gz
frameworks_base-96268545435c30d628b3644830d9e054d575d8c9.tar.bz2
Add a config for whether to start in touch mode.
Bug: 18925810 Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index a840ed9..089d897 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -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();