Commit Graph

36129 Commits

Author SHA1 Message Date
Dianne Hackborn
a1842e0b28 am 0f5a222d: Merge "Change wake reason checkin tag to "wr"."
* commit '0f5a222dabb943b5161fdbd0f1f4af4b9172c89f':
  Change wake reason checkin tag to "wr".
2014-05-02 21:13:18 +00:00
Dianne Hackborn
f589f2a190 Merge "Change wake reason checkin tag to "wr"." 2014-05-02 21:08:53 +00:00
Selim Gurun
16616b5706 am 63e690cc: Merge "Design a static API for clearclientcertpreferences"
* commit '63e690ccddb62609c2066a10f580a2f55516b08d':
  Design a static API for clearclientcertpreferences
2014-05-02 20:59:20 +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
3a11dbaa41 am 91058957: Merge "Add CanvasProperty for drawCircle"
* commit '91058957b673bee84d1f7694309c2b33a17a48ac':
  Add CanvasProperty for drawCircle
2014-05-02 20:51:11 +00: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
ed433f5b88 am 89094f50: Merge "Make GET_TASKS signature|system."
* commit '89094f504091775d1f7ff68cf9cde11c87d2417a':
  Make GET_TASKS signature|system.
2014-05-02 20:21:00 +00: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
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
7db103bb2d am 7c358ce4: Merge "Camera2: replace AssertionError with error log"
* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
  Camera2: replace AssertionError with error log
2014-05-02 18:50:07 +00:00
Zhijun He
25bb60e844 Merge "Camera2: replace AssertionError with error log" 2014-05-02 18:45:06 +00:00
Justin Koh
ce3c998337 am 93671ef4: am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
* commit '93671ef4b14fabcd06eb64618dc82f6e609edaa2':
  Make global action key timeout configurable.
2014-05-02 17:42:07 +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
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
Matthew Williams
f686bfa68a am b283ac25: Merge "Fix sdk build by removing javadoc link"
* commit 'b283ac25cbaf228dc8fdcde74e5c44e5db2af0da':
  Fix sdk build by removing javadoc link
2014-05-02 16:54:57 +00:00
Matthew Williams
6dd51be673 Merge "Fix sdk build by removing javadoc link" 2014-05-02 16:49:09 +00:00
Michael Wright
7e1c52bf40 am aacd869f: Merge "Fix WebViewClient docs"
* commit 'aacd869f7fdebfb9895699ecfb9c71c84f7f2708':
  Fix WebViewClient docs
2014-05-02 16:33:18 +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
af1019ffc2 am d70c9d98: Merge "Add API definition for WebSettings.allowMixedContent"
* commit 'd70c9d98771c950ef63e5c1c0fbe789043e5698f':
  Add API definition for WebSettings.allowMixedContent
2014-05-02 15:51:02 +00:00
Ben Murdoch
27ecb35b19 Merge "Add API definition for WebSettings.allowMixedContent" 2014-05-02 15:48:12 +00:00
Jeff Davidson
8319d99a34 am 9e35d785: Merge "API for network cache subsystems."
* commit '9e35d785d00a3dd219f08cb5bdf5d3c525837619':
  API for network cache subsystems.
2014-05-02 15:37:00 +00:00
Jeff Davidson
4cd4110f20 Merge "API for network cache subsystems." 2014-05-02 15:33:36 +00:00
Jason Monk
68b5c9d1ee am 0d4a7358: Merge "Add IME Switcher icon to Navigation Bar"
* commit '0d4a73588b47b96d6a8911c0199b70dda9adc29c':
  Add IME Switcher icon to Navigation Bar
2014-05-02 14:08:11 +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
ea0b39e406 am b6e85c22: Add additional display information to conditions.
* commit 'b6e85c221da39d8069cf266f9023a2ac1a72e7a2':
  Add additional display information to conditions.
2014-05-02 06:49:49 +00:00
John Spurlock
ef5693bb73 Add additional display information to conditions.
Change-Id: Ic9a7cb29b573af84185371099e7ae220906cc89c
2014-05-02 00:07:35 -04:00
Jungshik Jang
a8bf4c8eab am 9debdfa2: Implement logical address allocation logic for HDMI CEC.
* commit '9debdfa2fd6a6d1153b75033e68d1796010d7971':
  Implement logical address allocation logic for HDMI CEC.
2014-05-02 01:59:15 +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
f347bc39fc am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master"
* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
  Clean up some terminology related to interactive state.
2014-05-02 01:26:29 +00:00
Jungshik Jang
8af18df299 am a7842d4b: Merge "Implement add/remove device info api for Hdmi Cec device."
* commit 'a7842d4b68ff4bdcce9b3df1363a9f1c094e1a2a':
  Implement add/remove device info api for Hdmi Cec device.
2014-05-02 01:22:30 +00: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
Jungshik Jang
7d9a843af8 Implement add/remove device info api for Hdmi Cec device.
In order to manage info of all cec devices connected hdmi bus,
HdmiCecController should have data structure for them.
This change includes two major pieces.

1. HdmiCecDeviceInfo
 It's data structure containing basic device information such as
 logical address, physicall address, device type and vendor id.
 It will not be available to thirdparty but some system component
 like TIF needs this to update device information connected to
 its hdmi ports.

2. Managing device list in HdmiCecController.
 HdmiCecController is a host to manage all CEC device.
 and we need to have logic add or remove as well as get it.
 All cec devices are managed as sparsearray which uses logical address as key.

This change introduces internal api and the later change will have logic
to call these apis.

Change-Id: Idc2f189ac0bffe904e011ced0ac991f16da07db1
2014-05-02 10:15:38 +09:00
Alan Viverette
4520f3c1c3 am 084d7553: Merge "Support for list selector ripple during arrow movement & drag"
* commit '084d75532bc412a49a7e0d581d5a19a4c1ffed8e':
  Support for list selector ripple during arrow movement & drag
2014-05-02 01:04:54 +00:00
Alan Viverette
e4739ba259 Merge "Support for list selector ripple during arrow movement & drag" 2014-05-02 01:01:49 +00:00
Alan Viverette
de39939794 Support for list selector ripple during arrow movement & drag
BUG: 14231774
BUG: 14230395
Change-Id: I23efbc88c3f05b3f323e47bcb34f55ff70ad6828
2014-05-01 17:20:55 -07:00
Jeff Brown
4f8cd18880 am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev
* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.
2014-05-01 23:29:13 +00:00
Alan Viverette
fb403b73b8 am fa1a3b14: Merge "Fix build, also always draw accessibility focus rect"
* commit 'fa1a3b14f6d626e8ad6bef41a6ab4bcb01034ba4':
  Fix build, also always draw accessibility focus rect
2014-05-01 22:58:01 +00:00
Michael Wright
1feb11f511 Fix WebViewClient docs
Change-Id: I960701a49be66fccfd03a8876779a5f7917642ea
2014-05-01 15:41:33 -07:00
Alan Viverette
0a7e8f9997 Fix build, also always draw accessibility focus rect
BUG: 13873026
Change-Id: Ie8c0b9d6ef10968f64fb33a89e010b9b15e93f8b
2014-05-01 15:41:13 -07:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state.
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Alan Viverette
8895ece8c3 am aadda965: Merge "Load device default theme mapping from resources"
* commit 'aadda9656ad084f277dc5e6c5332667c8f995246':
  Load device default theme mapping from resources
2014-05-01 21:49:12 +00:00