Michael Wright
112449ca29
Fixup InputManager javadoc
...
Change-Id: I708b62db4861c7d391258b980a2447e08ed0d89e
2015-10-22 17:23:12 +01:00
Michael Wright
244f776855
resolve merge conflicts of f013c3f111 to master.
...
Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907
2015-10-20 23:48:55 +01:00
Michael Wright
57a5cba606
Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev
2015-10-20 15:31:01 +00:00
Aravind Akella
cf3cd44b3c
am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a
...
am: fd81002e71
* commit 'fd81002e719737696c1c5913f2ba77f2e28883f3':
Fix a possible race condition in SensorManager initialization.
2015-10-20 01:12:52 +00:00
Aravind Akella
a05df455e8
Fix a possible race condition in SensorManager initialization.
...
Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
2015-10-19 12:18:37 -07:00
Jun Mukai
1db5397d88
Allow changing mouse pointer icon for the current context.
...
Right now, it only supports I-beam on EditText, but further
rules will come in the future.
The png files for the icons are from chromium.
Bug: 24180385
Change-Id: I8de4ec8a5412b4830c08aa232c5083841c5c751c
2015-10-15 01:47:29 -07:00
Michael Wright
9209c9cd9a
Add SystemUI component to watch for keyboard attachment.
...
Add a new SystemUI component to watch for keyboard attachment /
detachment. If the config specifies the name of a keyboard that is
packaged with the device, then SystemUI will ask the user if they
would like to enable BT (if disabled) and then attempt to pair to the
device.
Bug: 22876536
Change-Id: I786db35524d49706d5e61d8b8bc71194d50113f3
2015-10-12 15:21:37 +01:00
Yin-Chia Yeh
074bf3cbda
am cbb3dc67: am 527da81f: am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string
...
* commit 'cbb3dc67cff56db3efd2032a49b0cc7186a60534':
Camera: fix wrong FULL feature string
2015-10-07 22:01:05 +00:00
Yin-Chia Yeh
9d68833686
am a636be6c: Camera: fix wrong FULL feature string
...
* commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e':
Camera: fix wrong FULL feature string
2015-10-07 21:36:35 +00:00
Yin-Chia Yeh
a636be6c9a
Camera: fix wrong FULL feature string
...
Bug: 24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
2015-10-06 13:45:20 -07:00
Jianing Wei
e185b87487
am 5a15b952: am 98e0cec2: am 3c708be3: am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc.
...
* commit '5a15b9529197d1e9a787814aceed0b815a144357':
Camera2: Update video stabilization API doc.
2015-10-02 09:06:04 +00:00
Jianing Wei
6ffe9f05de
am 2813b0fa: Camera2: Update video stabilization API doc.
...
* commit '2813b0fae99fed1096dc23c3899e223459a54cec':
Camera2: Update video stabilization API doc.
2015-10-01 16:40:21 +00:00
Jianing Wei
2813b0fae9
Camera2: Update video stabilization API doc.
...
Bug: 23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
2015-09-29 16:04:14 -07:00
Justin Harrison
c0f2bc0f0e
am 46db0f22: am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
...
* commit '46db0f2215ad6e969418d1fedd1578445b46588f':
Add support for setting color transforms
2015-09-19 18:14:55 +00:00
Justin Harrison
91f2123b2a
Merge "Add support for setting color transforms" into mnc-dr-dev
2015-09-19 00:21:41 +00:00
Michael Wright
58e829f71d
Add support for setting color transforms
...
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
2015-09-18 23:37:28 +00:00
Jim Kaye
f8d1e21e16
Eliminate false error messages when removing all fingerprints
...
When removing "all" fingerprints, the request is for ID 0, but
the responses are for the actual IDs being removed. When the
requested ID is 0, don't complain if the response ID doesn't match.
Change-Id: I1c8b5b567ea6164c9e0ce6d436ca3b7a6ba22825
2015-09-16 18:25:54 +00:00
Jim Miller
7876646249
am 4d3e0f8b: am f84e0535: am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
...
* commit '4d3e0f8b33572345e58e41f8540a9d3e3a9d7a35':
Add logging to track fingerprint reco but not unlocking
2015-09-15 22:30:03 +00:00
Jim Miller
1adb4a7693
Add logging to track fingerprint reco but not unlocking
...
Bug 23940153
Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
2015-09-14 19:12:35 -07:00
Jorim Jaggi
21bb7a3e38
am 463bf7cc: am 46154b8f: am b5304547: am 5e354223: Use AlarmManager for lockout reset
...
* commit '463bf7cc36660174166ad2aab7d1814bf35c8066':
Use AlarmManager for lockout reset
2015-09-09 21:59:23 +00:00
Jorim Jaggi
5e354223d8
Use AlarmManager for lockout reset
...
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.
Bug: 23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
2015-09-09 20:41:11 +00:00
Michael Wright
56dafdb5ae
am 7f7ffa37: am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
...
* commit '7f7ffa3722ef90a7bf5611221c4a4c9d06823a38':
Add TabletModeChangedListener for SystemUI.
2015-09-03 17:37:10 +00:00
Michael Wright
8ae90587a5
Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev
2015-09-03 14:00:52 +00:00
Tim Kilbourn
9ddb864bab
Fix input device listener registration in InputManager
...
If registerInputDeviceListener is called without enumerating input
devices, the InputManager will never register itself with the input
service.
Bug: 10415556
Change-Id: I0ae50bd1d4b8264ffe308b96e75c01cd47cf2387
2015-09-01 13:28:18 -07:00
Jorim Jaggi
6a89feae87
am 53c5dadb: am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets
...
* commit '53c5dadbb8ddf0898e91e129aee4a19f1028175a':
Add a private API to get notified about lockout resets
2015-09-01 16:10:10 +00:00
Jorim Jaggi
3a46478508
Add a private API to get notified about lockout resets
...
SystemUI uses it to start authentication again after lockout reset
expired.
Bug: 22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
2015-09-01 00:37:54 +00:00
Daniel Estrada Alva
aa8060df8c
am 08c04874: am f3349406: am 243095c9: am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
...
* commit '08c0487487ed77d25f2b0593cb3aba31b2b3fe57':
Disable AR HW when client binder dies.
2015-08-27 05:11:58 +00:00
Chien-Yu Chen
8af9d7687d
am fcfa1d57: am 2aa23ac6: am aebc3cce: am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'fcfa1d57ea6ab245095d3ab1fcef103fa0abcd83':
Camera: Update for reprocess session
2015-08-26 21:12:03 +00:00
Daniel Estrada Alva
47ee2ecf82
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
2015-08-26 21:09:50 +00:00
Chien-Yu Chen
fd059b34fa
am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
...
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
2015-08-26 19:07:52 +00:00
Chien-Yu Chen
e4c3ff2f50
Merge "Camera: Update for reprocess session" into mnc-dev
2015-08-26 18:56:15 +00:00
Daniel Estrada Alva
8ff73b596e
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
2015-08-26 17:30:09 +00:00
Yasuhiro Matsuda
92386c42a8
Merge "Broadcast ACTION_USB_STATE only if necessary."
2015-08-26 09:36:40 +00:00
Chien-Yu Chen
e90c6d0ad2
Camera: Update for reprocess session
...
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.
Bug: 23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
2015-08-25 11:58:21 -07:00
Eino-Ville Talvala
170e089551
am d9a24b1b: am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd9a24b1b907fabc76a9c4bdc07ac26b6959db811':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-25 00:46:50 +00:00
Eino-Ville Talvala
b8079c5c49
am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 23:39:22 +00:00
Eino-Ville Talvala
6393275f5f
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:16 +00:00
Eino-Ville Talvala
2bf7b98a2a
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
2015-08-24 23:08:00 +00:00
Eino-Ville Talvala
e3f5483977
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
...
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
2015-08-24 14:08:58 -07:00
Eino-Ville Talvala
a42cf680a5
Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
2015-08-24 19:22:04 +00:00
destradaa
e1a5144a1d
Cherry-pick: Add callback-based support for HW Activity Recognition.
...
Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.
Bug: 17112184
Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
2015-08-24 11:43:27 -07:00
destradaa
614612edb5
Disable AR HW when client binder dies.
...
Ensure that activities are unregistered from AR HW when the client's
binder dies. This clean up is required to prevent AR HW to keep active
when there are no clients listening for events.
Bug: 19894637
Change-Id: Iccd609cf1d2d4a4453c7a96cb8645b61639c3234
2015-08-24 11:02:52 -07:00
Eino-Ville Talvala
6960966f17
am 8c0104ef: am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '8c0104ef9fe5152c742a456c564c6588878e7645':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 07:24:08 +00:00
Eino-Ville Talvala
ec2efb9cac
am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
...
* commit '08b12dfba630659601972f0d857b6580fdae4313':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:38:01 +00:00
Eino-Ville Talvala
08b12dfba6
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
2015-08-22 05:33:26 +00:00
Eino-Ville Talvala
7ca1f243b8
am cf620038: am 68f46013: am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'cf620038f4af0fec5980fd9ef8e9234cfaf7670c':
Camera: Fix depth documentation issues
2015-08-22 01:38:25 +00:00
Jim Miller
c7506b3718
am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
Fix type-o in FingerprintManager documentation
2015-08-22 01:22:18 +00:00
Eino-Ville Talvala
2e3215c9f6
Camera: Add support for notifying NFC stack when camera is active
...
On some devices, NFC full poll operation and camera operation
interfere. Add a system property ro.camera.notify_nfc. When set to >
0, the NFC adapter will be notified to disable polling whenever the
camera is active.
Bug: 23393557
Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d
2015-08-21 17:41:47 -07:00
Eino-Ville Talvala
e5b4c3d5f3
am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
...
* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
Camera: Fix depth documentation issues
2015-08-22 00:25:38 +00:00
Eino-Ville Talvala
a7dde2e89e
Merge "Camera: Fix depth documentation issues" into mnc-dev
2015-08-22 00:14:13 +00:00