7027 Commits

Author SHA1 Message Date
Selim Gurun
f72382aec7 Merge "Unhide Client Cert APIS" 2014-05-02 21:34:25 +00:00
Alan Viverette
b407f170c5 am 47a61e52: Merge "Theme colors for legacy, Holo"
* commit '47a61e52317584ed84515e95d325d36fb94fc5e4':
  Theme colors for legacy, Holo
2014-05-02 21:31:15 +00:00
Alan Viverette
e85aef92d1 Merge "Theme colors for legacy, Holo" 2014-05-02 21:28:37 +00:00
Selim Gurun
f271c8ecd0 Unhide Client Cert APIS
Bug:12983007
Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
2014-05-02 14:19:16 -07:00
Alan Viverette
713813f279 Theme colors for legacy, Holo
BUG: 13677826
Change-Id: I60c38d9679c884fc8936a78732a52917db262d7d
2014-05-02 13:31:49 -07:00
RoboErik
1ae4c50af7 am 3ce0a7e8: Merge "Add playback state and metadata to dump"
* commit '3ce0a7e830b780cda47eb4e6cacf64d260cb273e':
  Add playback state and metadata to dump
2014-05-02 20:10:06 +00:00
RoboErik
4f854e0d0b Merge "Add playback state and metadata to dump" 2014-05-02 20:07:07 +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
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
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
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
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
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
RoboErik
66dea73906 Add playback state and metadata to dump
Change-Id: I813ff23c496f75776c8bd63f78bbe87683b19bc0
2014-05-01 16:16:00 -07: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
Alan Viverette
0a7e8f9997 Fix build, also always draw accessibility focus rect
BUG: 13873026
Change-Id: Ie8c0b9d6ef10968f64fb33a89e010b9b15e93f8b
2014-05-01 15:41:13 -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
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
31a5f6fbbc am 576eedef: Merge "Add unhandledInputEvent API to ViewRoot"
* commit '576eedefe910d45d46da2f37457e415fdd0479dc':
  Add unhandledInputEvent API to ViewRoot
2014-05-01 21:19:20 +00:00
Michael Wright
e02bfb6fbd Merge "Add unhandledInputEvent API to ViewRoot" 2014-05-01 21:15:29 +00:00
Adam Powell
5ba97655c2 am 856b64e9: Add support for hiding action bars on scroll.
* commit '856b64e9d8ab445fcef4504b2e20471cdba04b23':
  Add support for hiding action bars on scroll.
2014-05-01 19:57:10 +00: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
RoboErik
c4c2ff54ee am a6b4c155: Merge "Fix build"
* commit 'a6b4c1554b9200757fda7eb449b9b47fe6db7656':
  Fix build
2014-05-01 18:21:33 +00:00
RoboErik
8da1e46ede Fix build
A CL missed running update-api after making a change before submitting.
6e31c5c82b

Change-Id: I62b33f07a98ecd546d8128c1eeb4c01bd338f202
2014-05-01 11:16:19 -07:00
Matthew Williams
abb81817ea am a54edd7e: Merge "TaskManager API first pass."
* commit 'a54edd7eb31e641630d594de37b3ee9ce6ddfa61':
  TaskManager API first pass.
2014-05-01 17:49:34 +00:00
Matthew Williams
674bc2fca5 Merge "TaskManager API first pass." 2014-05-01 17:45:34 +00:00
RoboErik
3f32ef550e am 668885a4: Merge "Add Session API calls to RCC and AudioManager"
* commit '668885a41af63ed7a889e7fb2fa939f5ce3150c6':
  Add Session API calls to RCC and AudioManager
2014-05-01 17:20:26 +00:00
RoboErik
6e6a6e863d Merge "Add Session API calls to RCC and AudioManager" 2014-05-01 17:14:56 +00:00
RoboErik
f1372428f2 Add Session API calls to RCC and AudioManager
This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.

Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
2014-05-01 17:14:01 +00:00
Nicolas Prevot
6483a805d4 am 4cd07224: Merge "Introduce forwarding intents across profiles."
* commit '4cd07224df582d6b6f9be5b1d04ab65bbd00d3f7':
  Introduce forwarding intents across profiles.
2014-05-01 09:20:35 +00:00
Nicolas Prevot
ff2e05e1f6 Merge "Introduce forwarding intents across profiles." 2014-05-01 09:17:13 +00:00
Nicolas Prevot
10fa67c77e Introduce forwarding intents across profiles.
The package manager service maintains, for some user ids, a list of forwarding intent filters.
A forwarding intent filter is an intent filter with a destination (a user id).
If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent.

When the package manager service is asked for components that resolve an intent:
If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent:
The package manager service also returns the IntentForwarderActivity.
This activity will forward the intent to the destination.

Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
2014-04-30 19:24:52 +01:00
Kenny Guy
76f08ee7df am 56afa6d5: Merge "Extend LauncherApps service to expose enabled state."
* commit '56afa6d53216541aa397b051ab74c130f488cd96':
  Extend LauncherApps service to expose enabled state.
2014-04-30 17:39:33 +00:00
Kenny Guy
7e5264ced7 Merge "Extend LauncherApps service to expose enabled state." 2014-04-30 17:38:10 +00:00
Michael Wright
899d70568b Add unhandledInputEvent API to ViewRoot
Update WebViewClient to use it instead, and add a new public API,
onUnhandledInputEvent. Note that WebViewClients won't receive this
call back until WebView is updated to use it.

Bug: 14279909

Change-Id: Ied49791b469849f5c4cf4471f2b26c56b03f4961
2014-04-29 15:02:34 -07:00
George Mount
3ee5f40da2 am 8721a548: Merge "Add mechanism for Transitions to target a class."
* commit '8721a548c13281b4e603db88791d90141acac65c':
  Add mechanism for Transitions to target a class.
2014-04-29 21:33:28 +00:00
George Mount
97ff65442a am f1526de2: Merge "Transfer image of shared element to launched Activity."
* commit 'f1526de298e4bfbf1378ba70e04f88286b2f5594':
  Transfer image of shared element to launched Activity.
2014-04-29 21:33:25 +00:00
George Mount
989a4e9b13 Merge "Add mechanism for Transitions to target a class." 2014-04-29 21:30:37 +00:00
George Mount
f31d367a5c Merge "Transfer image of shared element to launched Activity." 2014-04-29 21:30:27 +00:00
George Mount
96829515c4 am d7fe8929: Merge "Add Transform and ClipBounds Transitions."
* commit 'd7fe8929426453ac0fa22cca6b92f2a77c8f340d':
  Add Transform and ClipBounds Transitions.
2014-04-29 20:58:35 +00:00
George Mount
b061087212 Merge "Add Transform and ClipBounds Transitions." 2014-04-29 20:56:18 +00:00
George Mount
430f910f37 am cb9f337a: Merge "Add ability to exclude Views in transition XML."
* commit 'cb9f337af3994a4424ca305258bcde8518b9cb40':
  Add ability to exclude Views in transition XML.
2014-04-29 20:54:42 +00:00
George Mount
6eb2bc52a5 Merge "Add ability to exclude Views in transition XML." 2014-04-29 20:49:26 +00:00
Jae Seo
ed18089025 am c1201aa5: Merge "Add more URI patterns for accessing TV metadata"
* commit 'c1201aa56381a548c4d7ce80e7ad47fd832699f0':
  Add more URI patterns for accessing TV metadata
2014-04-29 20:25:57 +00:00
Jae Seo
994925d666 Merge "Add more URI patterns for accessing TV metadata" 2014-04-29 20:21:51 +00:00