Commit Graph

1747 Commits

Author SHA1 Message Date
Michael Wright
0de19dfa47 Merge changes from topic 'kb-layout'
* changes:
  Always show enabled keyboards.
  Bandaid over broken keyboard layout selection process.
2016-01-08 20:55:02 +00:00
Narayan Kamath
65c7835394 Merge "Trivial correction of Camera2 API description" am: a909dad0c3
am: 7e308606f6

* commit '7e308606f605dd1bd047e20e17ee53122a64b8ba':
  Trivial correction of Camera2 API description
2016-01-08 09:48:32 +00:00
Narayan Kamath
7e308606f6 Merge "Trivial correction of Camera2 API description"
am: a909dad0c3

* commit 'a909dad0c36542ffbc155f98b4eb054921b1bbd0':
  Trivial correction of Camera2 API description
2016-01-08 09:44:34 +00:00
Hidenari Koshimae
0fa4914484 Trivial correction of Camera2 API description
Change-Id: Ibb3393b94812dfe7b496182bb5ef43f1a5df7434
2016-01-08 16:18:59 +09:00
Michael Wright
0748342d2e Bandaid over broken keyboard layout selection process.
Automatically select a keyboard layout if we have one that is device
specific and is made for our current locale. Also, provide a way of
requesting layouts for a specific input device rather than just
getting all of them. Custom layouts may not be appropriate for
typical keyboard devices (and custom keyboards may not work with
typical layouts).

Bug: 25062009

Change-Id: I3a0ae5ad68f956b936485791ceb78c347fad7d4f
2016-01-05 13:13:53 -05:00
Jun Mukai
347e5d498f Introduce pointer capture API.
This depends on I4189eb4d93f50c2865b7a325727be5ceebcc71f8 of
frameworks/native.

Bug: 5452473
Change-Id: Ie21e521f3e5c581f976dc0feb5d84bfa48b046cd
2015-12-18 10:22:43 -08:00
Eino-Ville Talvala
3282f864f8 Merge "Revert "Camera2: create new streams if surface size has changed"" am: 79ac3edc57
am: 6e49caeaab

* commit '6e49caeaabeb852f0b6cd1e75d9871bc6b70b981':
  Revert "Camera2: create new streams if surface size has changed"
2015-12-17 00:39:07 +00:00
Eino-Ville Talvala
fefcb9bae2 Merge "Camera2: create new streams if surface size has changed" am: bcb636d423
am: c8a16ab564

* commit 'c8a16ab564532cbbdd781d0528c825945c63e907':
  Camera2: create new streams if surface size has changed
2015-12-17 00:37:41 +00:00
Eino-Ville Talvala
6e49caeaab Merge "Revert "Camera2: create new streams if surface size has changed""
am: 79ac3edc57

* commit '79ac3edc57f93d6b8e8187b549dd23512b841fb2':
  Revert "Camera2: create new streams if surface size has changed"
2015-12-16 23:20:29 +00:00
Eino-Ville Talvala
c8a16ab564 Merge "Camera2: create new streams if surface size has changed"
am: bcb636d423

* commit 'bcb636d4232bedfb421ecaa157f67b96a1b26944':
  Camera2: create new streams if surface size has changed
2015-12-16 23:09:29 +00:00
Yin-Chia Yeh
e94b3fe953 Revert "Camera2: create new streams if surface size has changed"
This change is redundant after the following change is merged:

Camera2: Handle surface size change

When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: I4216260a0a08ad87b835ed97e9eaddf1df317fcc
This reverts commit f49f8b0bad.
2015-12-16 22:50:48 +00:00
Jun Mukai
d4eaef7f4c Make public pointer icon API with custom icons.
BUG: 25778347, 23804184
Change-Id: If138b97c750c912e9848412c27b65004899961eb
2015-12-14 19:45:10 -08:00
Mikael Persson
f49f8b0bad Camera2: create new streams if surface size has changed
When a new capture session is created, the old streams
are re-used if same surface and rotation. However, if the
surface has changed size, we must re-create the stream
to ensure HAL is configured properly, which includes
setting up proper sensor resolution.

This is an issue in e.g. CTS testNoiseReductionModes
and testEdgeModeControl, where a new preview with different
size can be setup without first stopping the previous one.
The same preview surface is used here, but with changed size.

Change-Id: I3b88a95209e83cf1cef0f4d1f791c87b0feb093f
Signed-off-by: Mikael Persson <mikael.persson@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-12-10 16:02:05 +08:00
Eino-Ville Talvala
2e8ae98c2f Merge "Replace hard-coded errno values with OsConstants" am: cb299b858f
am: 6fa9cc1bd3

* commit '6fa9cc1bd3cdb0489452396f708d57e22f742bf7':
  Replace hard-coded errno values with OsConstants
2015-12-09 23:17:31 +00:00
Eino-Ville Talvala
6fa9cc1bd3 Merge "Replace hard-coded errno values with OsConstants"
am: cb299b858f

* commit 'cb299b858f4f073e2abd4ad45aa944dc0dfd0aa2':
  Replace hard-coded errno values with OsConstants
2015-12-09 21:25:15 +00:00
Eino-Ville Talvala
cb299b858f Merge "Replace hard-coded errno values with OsConstants" 2015-12-09 21:14:21 +00:00
Yin-Chia Yeh
44581ff4db Camera: add RAW_PRIVATE format
Also add necessary plumbing for RAW_PRIVATE to work for ImageReader.

Bug: 25596619
Change-Id: Ic90f3f44264ac46fae1fafbc27ac64b5319f0970
2015-12-09 11:20:32 -08:00
Daichi Hirono
4751880a4d Grant USB device permission by using system permission.
Previously it skips the device permission check by referring package
name. The CL removes the special case and use general MANAGE_USB
system-only permission to skip USB device permission dialog.

BUG=26048722

Change-Id: I3702393a50696209499d1e5f6549dab9fb2cefe4
2015-12-09 11:15:25 +09:00
Eino-Ville Talvala
d351e29b8e Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b am: 5794dbb1a5
am: dd00ed1554

* commit 'dd00ed1554113d52c8b07ee36d5b0b912d74a268':
  Camera: codegen doc update
2015-12-05 00:45:33 +00:00
Eino-Ville Talvala
add4b91d41 Merge "Camera: codegen doc update" into mnc-dev
am: 69c5e7143d

* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
  Camera: codegen doc update
2015-12-04 16:03:23 -08:00
Lazar Trsic
8ea56f6851 Replace hard-coded errno values with OsConstants
Errno values have been hard-coded inside java code. On the native side
however, bionic's errno.h is used (through utils/Errors.h). Some of
the numbers are architecture dependent (EOPNOTSUPP, ETIMEDOUT...).

This causes Camera app to crash on MIPS devices. There is a check for
expected errors, in CameraBinderDecorator.throwOnError, but the error
(EOPNOTSUPP) is not recognized and an exception is thrown.

Change-Id: I8bcac8f1ced50c76614f566a6e624967a18a25e1
2015-12-04 12:41:37 +01:00
Neil Fuller
568f4de11a Merge "Fix @code escapes" 2015-12-03 09:44:01 +00:00
Neil Fuller
71fbb81b14 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
2015-12-02 14:24:11 +00:00
Yohei Yukawa
fb5e1fd0ee Merge "Plumb IME subtype change from IMMS to IMS." 2015-12-01 18:47:17 +00:00
Yohei Yukawa
b097b8262b Plumb IME subtype change from IMMS to IMS.
This is a plumbing CL from IMMS to IMS to notify when the current input
method subtype is changed.  Those events are supposed to be used to
change physical keyboard layout depending on input method subtype, which
is to be implemented in subsequent CLs.

Bug: 25753054
Change-Id: I58e71ffce9ac9131551a00dd35e24235dadfef87
2015-12-01 10:43:08 -08:00
Yin-Chia Yeh
5fdf0a1af0 Camera: codegen doc update
Bug: 25427163
Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
2015-11-30 14:25:37 -08:00
Zhijun He
8998ad9675 Camera2: update dynamic black level type
They should be floats rather than integers for better precision.

Bug: 23011454
Change-Id: I8c10ff0bc5f07f1d53cdbda36da55b4483f721aa
2015-11-25 01:14:02 +00:00
Zhijun He
cd950b682c Camera2: add dynamic black level support
Also add the optical black regions static memtadata.

Bug: 23011454
Change-Id: I217f33e89e046991f4cded7f7213ce6793ec4e68
2015-11-23 12:09:10 -08:00
Eino-Ville Talvala
78c90c2376 Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 am: 0e57a4d021 am: 7a062ed396
am: 184cefc2ae

* commit '184cefc2ae33dde0d82a2ee4ed2683b05df9ccc3':
  Camera: Documentation updates
2015-11-12 01:38:37 +00:00
Eino-Ville Talvala
37e78cf8f1 Camera: Documentation updates
am: d8407271ff

* commit 'd8407271ffa83d27e9a524f485a0799e422e1fd6':
  Camera: Documentation updates
2015-11-12 01:10:07 +00:00
Eino-Ville Talvala
d8407271ff Camera: Documentation updates
- Clarify hardware.camera feature being only for the back camera
 - Clarify what setting a CaptureRequest field to null does
 - Use preCorrectionActiveArray instead of activeArray in list of
   possible raw output sizes
 - Clarify length of GPS processing field for camera1 API

Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
2015-11-11 23:59:38 +00:00
Jinsuk Kim
cb802870f7 CEC: Queue up callbacks to handle on final result
While one party calls oneTouchPlay() to initiate the action and
put it in progress, the other parties making the same call gets
an error 'operation in progress'. This is not really an error,
but there was no other choice for them but just to wait till
the action is completed and the service is ready to accept
the API call again.

This CL resolves the inconvenice by allowing multiple callbacks
rather than returning IN_PROGRESS for those joining later. Same
was applied to queryDisplayStatus().

Change-Id: I5fc9aba4aa73e76a25f8fdec37e11cd961a3d35f
(cherry picked from commit 98a25f1ee27c1b4362a23981edc17fc92199a876)
2015-11-09 19:14:56 +00:00
Sanket Agarwal
7058e4ca58 Radio features for Automotive usecase.
1. Add clock to metadata - If the CAR does not have a clock (no network
or bad clock) then Radio RDS could be used as a proxy.
2. Add support for emergency announcement - If the CAR wants to make an
emergency announcement.
    2.1 Add support for callbacks.

Bug: b/24807501
Bug: b/22701655

Change-Id: Ib3131de03a022181559fd31da6701d9d3fa8698d
(cherry picked from commit 659688a129189f2a9aa353ddf9e107d5f293c4ca)
2015-11-05 22:50:59 +00:00
Philip P. Moltmann
85e1d5045c Fix javadoc for CameraManager.AvailabilityCallback
The javadoc for CameraManager.AvailabilityCallback was missing an "#".
This causes the link to registerAvailabilityCallback not being generated
correctly.

Once the "#" was added the link shows up correctly.

Change-Id: I3da3aa737a6af487f117eccbeee5c682c003b7e2
2015-10-26 08:56:45 -07:00
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