OSDN Git Service
Zhijun He [Fri, 2 May 2014 18:50:07 +0000 (18:50 +0000)]
am
7c358ce4: Merge "Camera2: replace AssertionError with error log"
* commit '
7c358ce4a1961612ed5f644ec8827010db545dec':
Camera2: replace AssertionError with error log
Zhijun He [Fri, 2 May 2014 18:45:05 +0000 (18:45 +0000)]
Merge "Camera2: replace AssertionError with error log"
Scott Main [Fri, 2 May 2014 18:27:09 +0000 (18:27 +0000)]
am
7d9d1c04: am
7cb2bf1b: am
3525b3c7: am
44e7ed77: am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
7d9d1c04cc0ee0e1220c349053282392fc6701c5':
add intel USB vendor ID bug:
13982556
Scott Main [Fri, 2 May 2014 18:21:05 +0000 (18:21 +0000)]
am
7cb2bf1b: am
3525b3c7: am
44e7ed77: am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
7cb2bf1bf3d6ecb9c0a104c3cbc6486b5ffd8652':
add intel USB vendor ID bug:
13982556
Scott Main [Fri, 2 May 2014 18:18:34 +0000 (18:18 +0000)]
am
3525b3c7: am
44e7ed77: am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
3525b3c7e9d7d4fd2c60d88f6e3b92c30ec68558':
add intel USB vendor ID bug:
13982556
Scott Main [Fri, 2 May 2014 18:13:11 +0000 (18:13 +0000)]
am
44e7ed77: am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
44e7ed77f16f6773d950e8b7a4fadb526b4c7a8a':
add intel USB vendor ID bug:
13982556
Scott Main [Fri, 2 May 2014 18:10:30 +0000 (18:10 +0000)]
am
5584601c: add intel USB vendor ID bug:
13982556
* commit '
5584601c8ade068f403808a3c2b5e9c611134ab2':
add intel USB vendor ID bug:
13982556
Lajos Molnar [Fri, 2 May 2014 18:09:17 +0000 (18:09 +0000)]
am
cba1bcc6: Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"
* commit '
cba1bcc60f47af9007d23c141317f5d2880a09e6':
MediaHTTPConnection: support header android-allow-cross-domain-redirect
Lajos Molnar [Fri, 2 May 2014 18:02:45 +0000 (18:02 +0000)]
Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"
Scott Main [Fri, 2 May 2014 17:50:50 +0000 (10:50 -0700)]
add intel USB vendor ID
bug:
13982556
Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
Justin Koh [Fri, 2 May 2014 17:42:07 +0000 (17:42 +0000)]
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.
Justin Koh [Fri, 2 May 2014 17:33:48 +0000 (17:33 +0000)]
am
9abf0b90: am
60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
* commit '
9abf0b9031d0ddc33970589d2fb88065d15de712':
Make global action key timeout configurable.
Justin Koh [Fri, 2 May 2014 17:28:53 +0000 (17:28 +0000)]
am
60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
* commit '
6015844578dc4d725c7ab3d3004d18ffea446087':
Make global action key timeout configurable.
Justin Koh [Fri, 2 May 2014 17:25:50 +0000 (17:25 +0000)]
Merge "Make global action key timeout configurable." into klp-modular-dev
Justin Koh [Fri, 2 May 2014 17:02:44 +0000 (10:02 -0700)]
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
Mark Renouf [Fri, 2 May 2014 16:59:11 +0000 (16:59 +0000)]
am
8302a4d9: am
63f72806: am
11b14691: Implement cliff guard for swipeDismiss gesture
* commit '
8302a4d960ee2f4f22d9816f12218761d26f0707':
Implement cliff guard for swipeDismiss gesture
Matthew Williams [Fri, 2 May 2014 16:54:57 +0000 (16:54 +0000)]
am
b283ac25: Merge "Fix sdk build by removing javadoc link"
* commit '
b283ac25cbaf228dc8fdcde74e5c44e5db2af0da':
Fix sdk build by removing javadoc link
Mark Renouf [Fri, 2 May 2014 16:52:29 +0000 (16:52 +0000)]
am
63f72806: am
11b14691: Implement cliff guard for swipeDismiss gesture
* commit '
63f728065a7584e3a51bb7b0b58ce8cf0c25390e':
Implement cliff guard for swipeDismiss gesture
Matthew Williams [Fri, 2 May 2014 16:49:09 +0000 (16:49 +0000)]
Merge "Fix sdk build by removing javadoc link"
Mark Renouf [Fri, 2 May 2014 16:45:34 +0000 (16:45 +0000)]
am
11b14691: Implement cliff guard for swipeDismiss gesture
* commit '
11b1469144d73ad0280ef9d0c2e478d180f17074':
Implement cliff guard for swipeDismiss gesture
Michael Wright [Fri, 2 May 2014 16:33:18 +0000 (16:33 +0000)]
am
aacd869f: Merge "Fix WebViewClient docs"
* commit '
aacd869f7fdebfb9895699ecfb9c71c84f7f2708':
Fix WebViewClient docs
Michael Wright [Fri, 2 May 2014 16:29:27 +0000 (16:29 +0000)]
Merge "Fix WebViewClient docs"
Matthew Williams [Fri, 2 May 2014 16:22:25 +0000 (09:22 -0700)]
Fix sdk build by removing javadoc link
Change-Id: I3ed2a1a0f0c52ad6726be321d03a2c19e5b28d31
Ben Murdoch [Fri, 2 May 2014 15:51:02 +0000 (15:51 +0000)]
am
d70c9d98: Merge "Add API definition for WebSettings.allowMixedContent"
* commit '
d70c9d98771c950ef63e5c1c0fbe789043e5698f':
Add API definition for WebSettings.allowMixedContent
Ben Murdoch [Fri, 2 May 2014 15:48:11 +0000 (15:48 +0000)]
Merge "Add API definition for WebSettings.allowMixedContent"
Jeff Davidson [Fri, 2 May 2014 15:37:00 +0000 (15:37 +0000)]
am
9e35d785: Merge "API for network cache subsystems."
* commit '
9e35d785d00a3dd219f08cb5bdf5d3c525837619':
API for network cache subsystems.
Jeff Davidson [Fri, 2 May 2014 15:33:36 +0000 (15:33 +0000)]
Merge "API for network cache subsystems."
Jorim Jaggi [Fri, 2 May 2014 14:58:43 +0000 (14:58 +0000)]
am
c05e42b1: Epic performance fix during animation.
* commit '
c05e42b19c8fd24a0e95bd4026245382a042fa79':
Epic performance fix during animation.
Jorim Jaggi [Fri, 2 May 2014 14:46:02 +0000 (16:46 +0200)]
Epic performance fix during animation.
Change-Id: I0a5627543a048cc5348f482ea3407676c9b42126
Jorim Jaggi [Fri, 2 May 2014 14:34:59 +0000 (14:34 +0000)]
am
1232854e: Always use algorithm to set the children height.
* commit '
1232854ef30a3506eb616e804776b9ee72bb9c49':
Always use algorithm to set the children height.
Jorim Jaggi [Fri, 2 May 2014 14:34:56 +0000 (14:34 +0000)]
am
6d8c50b1: Fix animation play time, animation and alpha.
* commit '
6d8c50b14b3810c188af509472046ec1ed99df41':
Fix animation play time, animation and alpha.
Jorim Jaggi [Fri, 2 May 2014 14:34:47 +0000 (14:34 +0000)]
am
f57d5aa4: Update panel height when stack scroller padding is updated.
* commit '
f57d5aa4e737ab147068fa72d6ced92c41054ebb':
Update panel height when stack scroller padding is updated.
Jorim Jaggi [Fri, 2 May 2014 14:34:44 +0000 (14:34 +0000)]
am
81e60810: Introduce animation for changing top margin.
* commit '
81e6081031f4b560d2550edb06320b94295b9839':
Introduce animation for changing top margin.
Jorim Jaggi [Fri, 2 May 2014 14:34:41 +0000 (14:34 +0000)]
am
9b71e298: Change interaction for dragging down to full shade.
* commit '
9b71e298c0d0286fe64caa511ed2e5dfef3e8adb':
Change interaction for dragging down to full shade.
Jorim Jaggi [Fri, 2 May 2014 14:34:32 +0000 (14:34 +0000)]
am
e071ba1f: Introduce SHADE_LOCKED as a special state for the shade.
* commit '
e071ba1f3ce8d550d61629d965e649c32f3541e5':
Introduce SHADE_LOCKED as a special state for the shade.
Jorim Jaggi [Thu, 1 May 2014 18:18:31 +0000 (20:18 +0200)]
Always use algorithm to set the children height.
This makes possible to animate between different children heights
between the states.
Change-Id: I5d74814a84c7ff5406481c3ab0553530ee20997b
Jorim Jaggi [Thu, 1 May 2014 20:40:56 +0000 (22:40 +0200)]
Fix animation play time, animation and alpha.
Change-Id: Ib5f0a7880473930da3db70fcbd8c4e620f267cf8
Jorim Jaggi [Thu, 1 May 2014 18:00:12 +0000 (20:00 +0200)]
Update panel height when stack scroller padding is updated.
Change-Id: Ib894c084fb2b78f7227fda33559079ad4f7cbb55
Jorim Jaggi [Thu, 1 May 2014 17:17:37 +0000 (19:17 +0200)]
Introduce animation for changing top margin.
Change-Id: I7f77a1c69efc2dca3e5a37e7d6fc497ae487ec46
Jorim Jaggi [Wed, 23 Apr 2014 14:13:15 +0000 (16:13 +0200)]
Change interaction for dragging down to full shade.
Starts expanding the card if it is expandable. If it's not, we
rubberband the expansion a lot. After the threshold has been reached,
we scale all the notifications up and make it fully white and opaque.
Change-Id: I9ecd020ca263b0f84e87fd6ab2332519ac5e9984
Jorim Jaggi [Wed, 23 Apr 2014 14:13:15 +0000 (16:13 +0200)]
Introduce SHADE_LOCKED as a special state for the shade.
This state can be either reached by tapping the more card or dragging
down on any card. In this state, the shade is fully interactive, but
the phone is stil locked. This state can only be enterred if
redaction is off but security is on. If redaction is on, we will show
the bouncer instead and go to the normal shade.
Bug:
14161523
Change-Id: I95ca0991745ffc11ed1028581e3da15265c12ae5
Jason Monk [Fri, 2 May 2014 14:08:11 +0000 (14:08 +0000)]
am
0d4a7358: Merge "Add IME Switcher icon to Navigation Bar"
* commit '
0d4a73588b47b96d6a8911c0199b70dda9adc29c':
Add IME Switcher icon to Navigation Bar
Jason Monk [Fri, 2 May 2014 14:04:51 +0000 (14:04 +0000)]
Merge "Add IME Switcher icon to Navigation Bar"
Jason Monk [Tue, 29 Apr 2014 20:50:53 +0000 (16:50 -0400)]
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
Ben Murdoch [Thu, 10 Apr 2014 14:31:06 +0000 (15:31 +0100)]
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
Christoph Studer [Fri, 2 May 2014 12:35:38 +0000 (12:35 +0000)]
am
90142ba9: Merge "Fix notification visibility reporting"
* commit '
90142ba99552faddd4a7de79909f2f6cc4035f16':
Fix notification visibility reporting
Christoph Studer [Fri, 2 May 2014 12:32:26 +0000 (12:32 +0000)]
Merge "Fix notification visibility reporting"
Christoph Studer [Wed, 30 Apr 2014 18:06:04 +0000 (20:06 +0200)]
Fix notification visibility reporting
Require the screen to be on for visibility reporting.
Change-Id: I600e2fa2861bddd41ab9f9f0f381d8b1c4946afa
Selim Cinek [Fri, 2 May 2014 10:18:40 +0000 (10:18 +0000)]
am
357a4459: Merge "Removed always running preDrawListener"
* commit '
357a4459459d75c8a647b0979e76255ed0637b41':
Removed always running preDrawListener
Selim Cinek [Fri, 2 May 2014 10:16:06 +0000 (10:16 +0000)]
Merge "Removed always running preDrawListener"
Selim Cinek [Fri, 2 May 2014 10:01:36 +0000 (12:01 +0200)]
Removed always running preDrawListener
Replaced a always running preDrawListener with one which is just posted on
demand.
Change-Id: Ie7667302d848fe4a109c04dc91376f0b44d3acd3
Jungshik Jang [Fri, 2 May 2014 06:49:54 +0000 (06:49 +0000)]
am
4f1bc7eb: Merge "Fix unmatched jni method name."
* commit '
4f1bc7ebccd1ec6e632b9638d74bf39ed11ff8e9':
Fix unmatched jni method name.
John Spurlock [Fri, 2 May 2014 06:49:49 +0000 (06:49 +0000)]
am
b6e85c22: Add additional display information to conditions.
* commit '
b6e85c221da39d8069cf266f9023a2ac1a72e7a2':
Add additional display information to conditions.
Jungshik Jang [Fri, 2 May 2014 04:50:50 +0000 (04:50 +0000)]
Merge "Fix unmatched jni method name."
Jungshik Jang [Fri, 2 May 2014 04:21:15 +0000 (13:21 +0900)]
Fix unmatched jni method name.
It breaks systemserver
Change-Id: Iecc5600d64a273c4bbf51bd8fd779a79a3dab107
John Spurlock [Fri, 2 May 2014 04:07:35 +0000 (00:07 -0400)]
Add additional display information to conditions.
Change-Id: Ic9a7cb29b573af84185371099e7ae220906cc89c
Jungshik Jang [Fri, 2 May 2014 01:59:15 +0000 (01:59 +0000)]
am
9debdfa2: Implement logical address allocation logic for HDMI CEC.
* commit '
9debdfa2fd6a6d1153b75033e68d1796010d7971':
Implement logical address allocation logic for HDMI CEC.
Mark Renouf [Thu, 1 May 2014 18:18:40 +0000 (14:18 -0400)]
Implement cliff guard for swipeDismiss gesture
BUG:
14319825
Change-Id: I6a80c91b4a6ee2eaf49a8c0c69065d4b97d7f8f2
Jungshik Jang [Wed, 30 Apr 2014 05:31:02 +0000 (14:31 +0900)]
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
Jeff Brown [Fri, 2 May 2014 01:26:29 +0000 (01:26 +0000)]
am
06dec565: Merge "resolved conflicts for merge of
4f8cd188 to master"
* commit '
06dec5656d75345566fd31a2cfc6bd5c84bf41de':
Clean up some terminology related to interactive state.
Jungshik Jang [Fri, 2 May 2014 01:22:30 +0000 (01:22 +0000)]
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.
Jeff Brown [Fri, 2 May 2014 01:21:57 +0000 (01:21 +0000)]
Merge "resolved conflicts for merge of
4f8cd188 to master"
Jungshik Jang [Fri, 2 May 2014 01:19:35 +0000 (01:19 +0000)]
Merge "Implement add/remove device info api for Hdmi Cec device."
Jeff Brown [Fri, 2 May 2014 01:19:31 +0000 (18:19 -0700)]
resolved conflicts for merge of
4f8cd188 to master
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
Jungshik Jang [Tue, 29 Apr 2014 06:12:43 +0000 (15:12 +0900)]
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
Alan Viverette [Fri, 2 May 2014 01:04:54 +0000 (01:04 +0000)]
am
084d7553: Merge "Support for list selector ripple during arrow movement & drag"
* commit '
084d75532bc412a49a7e0d581d5a19a4c1ffed8e':
Support for list selector ripple during arrow movement & drag
Alan Viverette [Fri, 2 May 2014 01:01:49 +0000 (01:01 +0000)]
Merge "Support for list selector ripple during arrow movement & drag"
Deepanshu Gupta [Fri, 2 May 2014 00:58:17 +0000 (00:58 +0000)]
am
c39ef2bf: Merge "Support actionProviderClass attribute for menus."
* commit '
c39ef2bf55b4c00d4cb4fa9c8f71e3adf09b546b':
Support actionProviderClass attribute for menus.
Deepanshu Gupta [Fri, 2 May 2014 00:56:11 +0000 (00:56 +0000)]
Merge "Support actionProviderClass attribute for menus."
Jungshik Jang [Fri, 2 May 2014 00:35:36 +0000 (00:35 +0000)]
am
bdeb0cde: Merge "Implement native send and receive logic for HdmiCecController."
* commit '
bdeb0cde89ef8ed4863079f0379f2d1e52314acc':
Implement native send and receive logic for HdmiCecController.
Jungshik Jang [Fri, 2 May 2014 00:32:44 +0000 (00:32 +0000)]
Merge "Implement native send and receive logic for HdmiCecController."
Alan Viverette [Fri, 2 May 2014 00:20:55 +0000 (17:20 -0700)]
Support for list selector ripple during arrow movement & drag
BUG:
14231774
BUG:
14230395
Change-Id: I23efbc88c3f05b3f323e47bcb34f55ff70ad6828
Eric Laurent [Thu, 1 May 2014 23:52:43 +0000 (23:52 +0000)]
am
2cb2f92c: Merge "fix AudioTrack and AudioRecord JNI"
* commit '
2cb2f92c941bce3fb91c02f05df39e5b3c462d21':
fix AudioTrack and AudioRecord JNI
Eric Laurent [Thu, 1 May 2014 23:49:51 +0000 (23:49 +0000)]
Merge "fix AudioTrack and AudioRecord JNI"
Jeff Brown [Thu, 1 May 2014 23:29:13 +0000 (23:29 +0000)]
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.
Jeff Brown [Thu, 1 May 2014 23:25:11 +0000 (23:25 +0000)]
Merge "Clean up some terminology related to interactive state." into klp-modular-dev
Deepanshu Gupta [Thu, 1 May 2014 23:18:34 +0000 (16:18 -0700)]
Support actionProviderClass attribute for menus.
The change adds support for view cookies for actionProviderClasses (for
example, ShareActionProvider) in the action bar menus.
This also provides a more robust search for the overflowMenuButton.
Change-Id: I316c8b9a69e2e337b41ba0fe4e61af9fe850f750
Selim Gurun [Thu, 1 May 2014 23:09:51 +0000 (23:09 +0000)]
am
e196e93c: am
1bf2bed1: (-s ours) am
e1a56162: (-s ours) am
83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '
e196e93c142130bfe04bba1ebbdc956dbf7793bd':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Selim Gurun [Thu, 1 May 2014 23:04:59 +0000 (23:04 +0000)]
am
1bf2bed1: (-s ours) am
e1a56162: (-s ours) am
83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '
1bf2bed1507872dbc5cdefef6f6d3e5a7f83daa2':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Selim Gurun [Thu, 1 May 2014 23:01:09 +0000 (23:01 +0000)]
am
e1a56162: (-s ours) am
83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '
e1a561620dd18dd71b65faafe5d2fad45794c80a':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Alan Viverette [Thu, 1 May 2014 22:58:01 +0000 (22:58 +0000)]
am
fa1a3b14: Merge "Fix build, also always draw accessibility focus rect"
* commit '
fa1a3b14f6d626e8ad6bef41a6ab4bcb01034ba4':
Fix build, also always draw accessibility focus rect
Selim Gurun [Thu, 1 May 2014 22:57:45 +0000 (22:57 +0000)]
am
83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
* commit '
83a538e40ed8bdcda64c4bb5a448c0357b8e5e73':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Vinod Krishnan [Thu, 1 May 2014 22:54:04 +0000 (22:54 +0000)]
am
1ae785c1: am
8e95d988: am
5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '
1ae785c1db63b6c257db89acca0ba1a083c1e7bd':
DialogAlert window changes for Micro
Selim Gurun [Thu, 1 May 2014 22:53:01 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
Alan Viverette [Thu, 1 May 2014 22:52:27 +0000 (22:52 +0000)]
Merge "Fix build, also always draw accessibility focus rect"
Bo Liu [Thu, 1 May 2014 22:46:27 +0000 (15:46 -0700)]
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
Change-Id: I5a515c348c058264361ca9191f8fd7f0e6ff932b
Vinod Krishnan [Thu, 1 May 2014 22:49:29 +0000 (22:49 +0000)]
am
8e95d988: am
5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '
8e95d9883666e2b4b1ce26b312d09ba42ae37f7a':
DialogAlert window changes for Micro
Vinod Krishnan [Thu, 1 May 2014 22:46:16 +0000 (22:46 +0000)]
am
5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '
5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253':
DialogAlert window changes for Micro
Vinod Krishnan [Thu, 1 May 2014 22:43:58 +0000 (22:43 +0000)]
Merge "DialogAlert window changes for Micro" into klp-modular-dev
Michael Wright [Thu, 1 May 2014 22:41:33 +0000 (15:41 -0700)]
Fix WebViewClient docs
Change-Id: I960701a49be66fccfd03a8876779a5f7917642ea
RoboErik [Thu, 1 May 2014 22:41:18 +0000 (22:41 +0000)]
Alan Viverette [Thu, 1 May 2014 22:41:13 +0000 (15:41 -0700)]
Fix build, also always draw accessibility focus rect
BUG:
13873026
Change-Id: Ie8c0b9d6ef10968f64fb33a89e010b9b15e93f8b
RoboErik [Thu, 1 May 2014 22:35:40 +0000 (15:35 -0700)]
Fix sdk build
Missed a doc tag.
Change-Id: Ic02c5fe83a28055bde544434c7b9f3e0c7060191
Jeff Brown [Thu, 1 May 2014 22:18:00 +0000 (15:18 -0700)]
Clean up some terminology related to interactive state.
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
Natalie Silvanovich [Thu, 1 May 2014 22:07:47 +0000 (22:07 +0000)]
am
4490f41a: Merge "Bounds Check in onPlaySoundEffect"
* commit '
4490f41a57e395d21fab4b86edf6d5833713d975':
Bounds Check in onPlaySoundEffect
Natalie Silvanovich [Thu, 1 May 2014 22:03:58 +0000 (22:03 +0000)]
Merge "Bounds Check in onPlaySoundEffect"
Brian Carlstrom [Thu, 1 May 2014 21:53:11 +0000 (21:53 +0000)]
am
901177c5: am
2de2e225: am
e3cceef7: am
0f7c0570: Merge "Minor cleanup of UsageStatsService"
* commit '
901177c5b3b35479ddd153bebb360b6565a8144d':
Minor cleanup of UsageStatsService
Alan Viverette [Thu, 1 May 2014 21:49:12 +0000 (21:49 +0000)]
am
aadda965: Merge "Load device default theme mapping from resources"
* commit '
aadda9656ad084f277dc5e6c5332667c8f995246':
Load device default theme mapping from resources
Amith Yamasani [Thu, 1 May 2014 21:49:08 +0000 (21:49 +0000)]
am
3540cceb: Merge "Deliver package broadcasts only to related profiles."
* commit '
3540ccebff6009554d25ff142a821eb1326aea08':
Deliver package broadcasts only to related profiles.
Brian Carlstrom [Thu, 1 May 2014 21:49:03 +0000 (21:49 +0000)]
am
2de2e225: am
e3cceef7: am
0f7c0570: Merge "Minor cleanup of UsageStatsService"
* commit '
2de2e22540441fd02e03abae5bcae8feb873b929':
Minor cleanup of UsageStatsService