49999 Commits

Author SHA1 Message Date
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
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
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
Eric Laurent
27e12e7292 Merge "fix AudioTrack and AudioRecord JNI" 2014-05-01 23:49:51 +00: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
Jeff Brown
7f6ab17d41 Merge "Clean up some terminology related to interactive state." into klp-modular-dev 2014-05-01 23:25:11 +00:00
Alan Viverette
85a3c8a5b7 Merge "Fix build, also always draw accessibility focus rect" 2014-05-01 22:52:28 +00:00
Vinod Krishnan
2c3e7a3486 am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '8e95d9883666e2b4b1ce26b312d09ba42ae37f7a':
  DialogAlert window changes for Micro
2014-05-01 22:49:29 +00:00
Vinod Krishnan
8e95d98836 am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253':
  DialogAlert window changes for Micro
2014-05-01 22:46:16 +00:00
Vinod Krishnan
5c10c3cfa6 Merge "DialogAlert window changes for Micro" into klp-modular-dev 2014-05-01 22:43:58 +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
Jinsuk Kim
c70d2295dd Define Feature action for obtaining info on a new CEC device
Feature action (or action) is a unit of CEC command flow that accomplish
a certain feature. This CL introduces an abstract class FeatureAction,
and a concrete one NewDeviceAction that is used to obtain detailed
information on a new logical device on the CEC bus.

Change-Id: I94a7e75fbb76fe547f07f9588a93c7ea5a85d856
2014-05-02 07:23:35 +09: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
2f3c8d070a Merge "Load device default theme mapping from resources" 2014-05-01 21:46:24 +00:00
Alan Viverette
0810b63739 Load device default theme mapping from resources
Also adds a few missing styles and reorganizes some XML files. Makes
stackViewStyle public since it's defined in DeviceDefault.

Change-Id: I8f6a0f93410948b38619594474d60dc40ece5917
2014-05-01 14:42:56 -07:00
Michael Wright
e02bfb6fbd Merge "Add unhandledInputEvent API to ViewRoot" 2014-05-01 21:15:29 +00:00
Mindy Pereira
5f81193f80 am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit 'ed7e36dc2ef400916356459f9ea67d66645a85fb':
  Update fling min velocity
2014-05-01 20:43:52 +00:00
Mindy Pereira
ed7e36dc2e am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit 'd5e92318b69d8af6d91dc3b51738913595e0f536':
  Update fling min velocity
2014-05-01 20:40:08 +00:00
Jason Monk
99013a24a5 Merge "Remove unused AndroidProxySelectorRoutePlanner" 2014-05-01 20:37:22 +00:00
Mindy Pereira
d5e92318b6 Merge "Update fling min velocity" into klp-modular-dev 2014-05-01 20:34:35 +00:00
Jason Monk
80d1f2890c Remove unused AndroidProxySelectorRoutePlanner
Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903
2014-05-01 16:34:30 -04:00
Adam Powell
b36e4f944f Add support for hiding action bars on scroll.
Also tweak the nested scrolling API around nested flings and fix a bug
where recursive nested scrolling would stop prematurely.

Change-Id: I561226db878b2493970440a6af3e2332c56a1913
2014-05-01 12:45:52 -07:00
John Spurlock
3a8557dc22 Merge "Implement long-term condition subscriptions." 2014-05-01 19:17:53 +00:00
John Spurlock
3b98b3f1f8 Implement long-term condition subscriptions.
Bind long-term conditions (like "in a meeting") to enter/exit
zen mode automatically.

Persist automatic condition subscriptions to maintain them across
reboots.

Normalize condition state binding: true => enter zen, false => exit.

Change-Id: Icba2b8b25c0a352ae8215f4c0a324e4f966c0165
2014-05-01 15:03:17 -04:00
Matthew Williams
57df4fd69e Address comments/fix javadoc in TaskManager API
Change-Id: I0cdff12971b88acb40571a5e63b7d644ef629911
2014-05-01 11:28:47 -07:00
Zhijun He
22589b47cd Camera2: replace AssertionError with error log
Bug: 14448494
Change-Id: I8962cea14324c5c2faa580d009c58db2d35219ae
2014-05-01 10:52:04 -07:00
Matthew Williams
674bc2fca5 Merge "TaskManager API first pass." 2014-05-01 17:45:34 +00:00
Baligh Uddin
bf4927ee0d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-01 16:18:21 +00:00
Baligh Uddin
4fb660cb6a Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:18 +00:00
Alexandra Gherghina
973a1d2741 Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 2014-05-01 15:42:07 +00:00