Commit Graph

38502 Commits

Author SHA1 Message Date
Zhijun He
dab4049383 Merge "Camera2: Minor update for hyperfocalDistance spec" 2014-05-04 23:38:28 +00:00
Zhijun He
b41fcc2506 Camera2: Minor update for hyperfocalDistance spec
Doc only change.

Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71
2014-05-04 16:29:57 -07:00
Jinsuk Kim
043aa252cf Merge "Define Feature action for obtaining info on a new CEC device" 2014-05-04 21:51:44 +00:00
Winson Chung
c74b3cb6f0 Merge "Adding ability to load a search widget into Recents." 2014-05-03 01:58:10 +00:00
Winson Chung
f7bca430d9 Adding ability to load a search widget into Recents.
Change-Id: Ie17d9b9a47c979774b39a37e87f75d9dadc79ad9
2014-05-02 18:45:40 -07:00
Winson Chung
3e586e4621 Merge "Refactoring activity method to update recents values." 2014-05-03 01:42:42 +00:00
Adam Powell
3feb0419d2 Merge "ListViews in ScrollViews and ScrollViews in ListViews" 2014-05-03 00:36:21 +00:00
Winson Chung
03a9baedc9 Refactoring activity method to update recents values.
Change-Id: Ic525be207714d34abe0c2d26091c3e46abcd9bad
2014-05-02 17:34:37 -07:00
Adam Powell
96d62aff0f ListViews in ScrollViews and ScrollViews in ListViews
Dogs and cats, living together, mass hysteria!

Add support for nested scrolling to AbsListView, granting the ability
to both ListView and GridView.

Change-Id: Iae5c0518c5cebe41927720a7a27916ef13ca706e
2014-05-02 17:16:04 -07:00
Igor Murashkin
94814218d2 camera2: Add camera-specific data types used for metadata key/value
Adds new public API classes:
* InputOutputFormatsMap
* LensShadingMap
* RggbChannelVector
* StreamConfigurationMap
* TonemapCurve

Adds new @hide classes:
* StreamConfiguration
* StreamConfigurationDuration

Minor changes:
* CameraDevice (doc only)
* Preconditions (new @hide function)

Change-Id: I2f3757e2fe9d63e710f51469c650377165fd6631
2014-05-02 15:55:30 -07:00
Igor Murashkin
b3a78b2ca9 camera2: Add re-usable data types for camera metadata key/values
Adds new types to public API:
* ColorSpaceTransform
* Range<T>
* SizeF (android.util)
* MeteringRectangle

Minor changes to:
* Size (docs and move to android.util)
* Preconditions (@hide)

Adds helper class:
* HashCodeHelpers

Change-Id: Ied6749a19234f3af9da838f365f8d68d90251aaf
2014-05-02 15:55:29 -07:00
Selim Gurun
56e36a9781 Merge "Add an import missing" 2014-05-02 21:54:30 +00:00
Selim Gurun
87a0351ddc Add an import missing
Change-Id: I99a15779bff3bae5dd78d823d1f6c7f644c98751
2014-05-02 14:52:49 -07:00
Selim Gurun
53b75c0838 Merge "Fix javadoc breakage" 2014-05-02 21:47:46 +00:00
Selim Gurun
8b414fc483 Fix javadoc breakage
Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
2014-05-02 14:40:41 -07:00
John Reck
7f090dfa64 Merge "Allow starting an RT animation via Canvas" 2014-05-02 21:36:57 +00:00
Selim Gurun
f72382aec7 Merge "Unhide Client Cert APIS" 2014-05-02 21:34:25 +00:00
John Reck
1c058e96b3 Allow starting an RT animation via Canvas
Change-Id: I8b105a01cf28ad03797b63347343f6b999d46386
2014-05-02 14:31:02 -07:00
Selim Gurun
f271c8ecd0 Unhide Client Cert APIS
Bug:12983007
Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
2014-05-02 14:19:16 -07:00
Dianne Hackborn
f589f2a190 Merge "Change wake reason checkin tag to "wr"." 2014-05-02 21:08:53 +00:00
Selim Gurun
c25f243a50 Merge "Design a static API for clearclientcertpreferences" 2014-05-02 20:56:44 +00:00
Dianne Hackborn
d06dcfd3db Change wake reason checkin tag to "wr".
The old "Wr" was also used for Wifi Running.

Also include discharge/charge time remaining in
checkin output.

Change-Id: I303a0be902002d0399b9eb76773857da9103e8ce
2014-05-02 13:54:13 -07:00
John Reck
0e82d134ee Merge "Add CanvasProperty for drawCircle" 2014-05-02 20:48:26 +00:00
John Reck
52244fff29 Add CanvasProperty for drawCircle
Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
2014-05-02 13:43:46 -07:00
Dianne Hackborn
5b8b920022 Merge "Make GET_TASKS signature|system." 2014-05-02 20:18:10 +00:00
Selim Gurun
e1c6c3ae21 Design a static API for clearclientcertpreferences
Bug: 12983007

Change-Id: I869b4cd4c178b8fedf725f108fd2e369895543e9
2014-05-02 13:08:55 -07:00
Adam Powell
9529d8f26f Merge "Fix a bug in querying showing state for action bars" 2014-05-02 20:04:01 +00:00
Adam Powell
c4b416f18d Fix a bug in querying showing state for action bars
Bug 14492418

Change-Id: I8d24fd90a8d4004ace186f5ce84ba68fc8419307
2014-05-02 12:55:24 -07:00
Dianne Hackborn
0923328962 Make GET_TASKS signature|system.
Normal apps can't hold it now.  If they try to use
getRecentTasks() or getRunningTasks() without the permission,
they will only see their own tasks and home in the list.

Also took this opportunity to eradicate all of the old pending
thumbnail stuff.

Change-Id: I6dc52a06221c78097162e4a8b482027b798bf3ee
2014-05-02 11:51:26 -07:00
Zhijun He
25bb60e844 Merge "Camera2: replace AssertionError with error log" 2014-05-02 18:45:06 +00:00
Justin Koh
f46009225b am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
* commit '9abf0b9031d0ddc33970589d2fb88065d15de712':
  Make global action key timeout configurable.
2014-05-02 17:33:48 +00:00
Justin Koh
9abf0b9031 am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
  Make global action key timeout configurable.
2014-05-02 17:28:53 +00:00
Justin Koh
6015844578 Merge "Make global action key timeout configurable." into klp-modular-dev 2014-05-02 17:25:50 +00:00
Justin Koh
feabd2c730 Make global action key timeout configurable.
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321

Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
2014-05-02 10:04:34 -07:00
Mark Renouf
698a7ab344 am 63f72806: am 11b14691: Implement cliff guard for swipeDismiss gesture
* commit '63f728065a7584e3a51bb7b0b58ce8cf0c25390e':
  Implement cliff guard for swipeDismiss gesture
2014-05-02 16:52:29 +00:00
Matthew Williams
6dd51be673 Merge "Fix sdk build by removing javadoc link" 2014-05-02 16:49:09 +00:00
Mark Renouf
63f728065a am 11b14691: Implement cliff guard for swipeDismiss gesture
* commit '11b1469144d73ad0280ef9d0c2e478d180f17074':
  Implement cliff guard for swipeDismiss gesture
2014-05-02 16:45:34 +00:00
Michael Wright
428d1e40a9 Merge "Fix WebViewClient docs" 2014-05-02 16:29:27 +00:00
Matthew Williams
ae3e53e933 Fix sdk build by removing javadoc link
Change-Id: I3ed2a1a0f0c52ad6726be321d03a2c19e5b28d31
2014-05-02 09:22:25 -07:00
Ben Murdoch
27ecb35b19 Merge "Add API definition for WebSettings.allowMixedContent" 2014-05-02 15:48:12 +00:00
Jeff Davidson
4cd4110f20 Merge "API for network cache subsystems." 2014-05-02 15:33:36 +00:00
Jason Monk
434bdf50b3 Merge "Add IME Switcher icon to Navigation Bar" 2014-05-02 14:04:52 +00:00
Jason Monk
f1ff209523 Add IME Switcher icon to Navigation Bar
Adds button in the same location as the menu button and overrides
it when present.  The setNavigationHintIconHints lets it know when
the button should be shown.

Bug: 14257632
Change-Id: Ia80de7fd2390cd8b083e37cbe58b7ee53555e619
2014-05-02 09:39:41 -04:00
Ben Murdoch
fe9fc3d1a3 Add API definition for WebSettings.allowMixedContent
Introduces an API for configuring how the WebView behaves with
regard to referencing insecure content from a secure origin.

By default, apps targeting <= KK will allow mixed content. New apps
will block all insecure content.

Bug: 13948531
Change-Id: Ie773ee144e223f78b6449da0a8564192dd9c1c5d
2014-05-02 14:17:25 +01:00
John Spurlock
ef5693bb73 Add additional display information to conditions.
Change-Id: Ic9a7cb29b573af84185371099e7ae220906cc89c
2014-05-02 00:07:35 -04:00
Mark Renouf
11b1469144 Implement cliff guard for swipeDismiss gesture
BUG: 14319825

Change-Id: I6a80c91b4a6ee2eaf49a8c0c69065d4b97d7f8f2
2014-05-02 01:56:54 +00:00
Jungshik Jang
3f74ab0ee0 Implement logical address allocation logic for HDMI CEC.
Logical address in CEC is to distinguish each logical device from others.
In order to allocate logical address for new device, CEC sends
<Polling Message> to CEC bus. <Polling Message> is a CEC message
which has the same address for both source and destination without
body frame. (10bits).
CEC allows one and more logical address for a device type.
For example, there are 3 logical address defined for recorder device(1, 2, 9).
Among logical address candidates for the given device type, CEC scans
first the previous logical address (preferred logical address) of device.
If a device has not been allocated any logical address, preferred address
will be 15 (Unregistered), which means scan address from the minimum address
number of type. For example for recorder device, it starts from 1.
If no devices acks to the <Polling Message> during scan, it will be the
logical address of the device.
Since logical address is determined by a series of sending <Polling Message>
it happens in IO thread with separate allocate logical address message
instead of individual sendCommand message.

Along with this, updated ADDR_FREE_USE(14) to ADDR_SPECIFIC_USE(14)
which is revised name on HDMI 1.4.

Change-Id: Ic96dcdbe4aaa3789cfed0352a88ca75369335a98
2014-05-02 10:50:08 +09:00
Jeff Brown
8822d4befd Merge "resolved conflicts for merge of 4f8cd188 to master" 2014-05-02 01:21:57 +00:00
Jungshik Jang
71beb20903 Merge "Implement add/remove device info api for Hdmi Cec device." 2014-05-02 01:19:35 +00:00
Jeff Brown
fb0448ab4b resolved conflicts for merge of 4f8cd188 to master
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
2014-05-01 18:19:31 -07:00