diff options
author | Clay Murphy <claym@google.com> | 2017-07-11 14:46:45 -0700 |
---|---|---|
committer | Clay Murphy <claym@google.com> | 2017-07-11 14:46:45 -0700 |
commit | 97621834cda62dcf3870da248df1a134a302afee (patch) | |
tree | 0cc00e020aeded4bb49bdb0088a9763d0176fd91 /en/devices/input/migration-guide.html | |
parent | e839b247f863ec564ef505aa4451e839511f37aa (diff) | |
parent | bb3e2e8572f4ebac3990869868c036efcd02fb12 (diff) | |
download | source.android.com-97621834cda62dcf3870da248df1a134a302afee.tar.gz |
resolve merge conflicts of bb3e2e85 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6b11c9ad616712c4571a425af01c7caa97394815
Diffstat (limited to 'en/devices/input/migration-guide.html')
-rw-r--r-- | en/devices/input/migration-guide.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/en/devices/input/migration-guide.html b/en/devices/input/migration-guide.html index 4ddc8274..6f50f004 100644 --- a/en/devices/input/migration-guide.html +++ b/en/devices/input/migration-guide.html @@ -44,8 +44,9 @@ USB product id / vendor id or by device name.</p> function input devices. These files should simple contain a line to set the keyboard type to <code>SPECIAL_FUNCTION</code>.</p> <p>A good way to ensure that all built-in input devices are appropriately configured -is to run <a href="dumpsys.html">Dumpsys</a> and look for devices that -are inappropriately using <code>Generic.kcm</code>.</p> +is to run <a + href="https://developer.android.com/studio/command-line/dumpsys.html">Dumpsys</a> +and look for devices that are inappropriately using <code>Generic.kcm</code>.</p> <h2 id="migrating-to-android-honeycomb-32">Migrating to Android Honeycomb 3.2</h2> <p>In Honeycomb 3.2, we added support for joysticks and extended the key layout file format to enable joystick axis mapping.</p> |