diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-01-27 22:08:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-27 22:08:28 +0000 |
| commit | 2210594dd03406985f1c6de3632823ae66717ca4 (patch) | |
| tree | 775ef53589e19c1213f57c4b988242c821cc0051 /services | |
| parent | 608316a47195c9bf77f3bacd4ed8d8785c4514bb (diff) | |
| parent | 597bb6968be56c1b8b0629ba89fec409084cc112 (diff) | |
| download | frameworks_base-2210594dd03406985f1c6de3632823ae66717ca4.zip frameworks_base-2210594dd03406985f1c6de3632823ae66717ca4.tar.gz frameworks_base-2210594dd03406985f1c6de3632823ae66717ca4.tar.bz2 | |
am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev
* commit '597bb6968be56c1b8b0629ba89fec409084cc112':
Add a config for whether to start in touch mode.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
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(); |