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
Deepanshu Gupta
dcdc660c65
am c39ef2bf: Merge "Support actionProviderClass attribute for menus."
...
* commit 'c39ef2bf55b4c00d4cb4fa9c8f71e3adf09b546b':
Support actionProviderClass attribute for menus.
2014-05-02 00:58:17 +00:00
Deepanshu Gupta
5fc37e7924
Merge "Support actionProviderClass attribute for menus."
2014-05-02 00:56:11 +00:00
Jungshik Jang
ddf70ba8cb
am bdeb0cde: Merge "Implement native send and receive logic for HdmiCecController."
...
* commit 'bdeb0cde89ef8ed4863079f0379f2d1e52314acc':
Implement native send and receive logic for HdmiCecController.
2014-05-02 00:35:36 +00:00
Jungshik Jang
615d1337fc
Merge "Implement native send and receive logic for HdmiCecController."
2014-05-02 00:32:44 +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
fb641c79a2
am 2cb2f92c: Merge "fix AudioTrack and AudioRecord JNI"
...
* commit '2cb2f92c941bce3fb91c02f05df39e5b3c462d21':
fix AudioTrack and AudioRecord JNI
2014-05-01 23:52:43 +00: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
Deepanshu Gupta
1f5e678c08
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
2014-05-01 16:24:24 -07:00
Selim Gurun
79894cd299
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
2014-05-01 23:09:51 +00:00
Selim Gurun
b94d412848
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
2014-05-01 23:04:59 +00:00
Selim Gurun
1bf2bed150
am e1a56162: (-s ours) am 83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
...
* commit 'e1a561620dd18dd71b65faafe5d2fad45794c80a':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
2014-05-01 23:01:09 +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
Selim Gurun
e1a561620d
am 83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
...
* commit '83a538e40ed8bdcda64c4bb5a448c0357b8e5e73':
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
2014-05-01 22:57:45 +00:00
Vinod Krishnan
b0b9645dbd
am 1ae785c1: am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
...
* commit '1ae785c1db63b6c257db89acca0ba1a083c1e7bd':
DialogAlert window changes for Micro
2014-05-01 22:54:04 +00:00
Selim Gurun
83a538e40e
Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"
2014-05-01 22:53:01 +00:00
Alan Viverette
85a3c8a5b7
Merge "Fix build, also always draw accessibility focus rect"
2014-05-01 22:52:28 +00:00
Bo Liu
61a7f61007
DO NOT MERGE Add DrawGlInfo kModeProcessNoContext
...
Change-Id: I5a515c348c058264361ca9191f8fd7f0e6ff932b
2014-05-01 15:51:41 -07: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
RoboErik
1f36799784
am b8ddcdc8: Fix sdk build
...
* commit 'b8ddcdc86382a92c5d12a8889dab2564ac254910':
Fix sdk build
2014-05-01 22:41:18 +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
RoboErik
cf43d9baab
Fix sdk build
...
Missed a doc tag.
Change-Id: Ic02c5fe83a28055bde544434c7b9f3e0c7060191
2014-05-01 15:35:40 -07:00
Jeff Brown
140ffc783c
Clean up some terminology related to interactive state.
...
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Natalie Silvanovich
65a340a469
am 4490f41a: Merge "Bounds Check in onPlaySoundEffect"
...
* commit '4490f41a57e395d21fab4b86edf6d5833713d975':
Bounds Check in onPlaySoundEffect
2014-05-01 22:07:47 +00:00
Natalie Silvanovich
e872a2f69f
Merge "Bounds Check in onPlaySoundEffect"
2014-05-01 22:03:58 +00:00
Brian Carlstrom
a218db3286
am 901177c5: am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
...
* commit '901177c5b3b35479ddd153bebb360b6565a8144d':
Minor cleanup of UsageStatsService
2014-05-01 21:53:11 +00: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
Amith Yamasani
2a0c1b5676
am 3540cceb: Merge "Deliver package broadcasts only to related profiles."
...
* commit '3540ccebff6009554d25ff142a821eb1326aea08':
Deliver package broadcasts only to related profiles.
2014-05-01 21:49:08 +00:00
Brian Carlstrom
edfb6b6b74
am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
...
* commit '2de2e22540441fd02e03abae5bcae8feb873b929':
Minor cleanup of UsageStatsService
2014-05-01 21:49:03 +00:00
Alan Viverette
2f3c8d070a
Merge "Load device default theme mapping from resources"
2014-05-01 21:46:24 +00:00
Brian Carlstrom
2de2e22540
am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
...
* commit 'e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c':
Minor cleanup of UsageStatsService
2014-05-01 21:45:38 +00:00
Amith Yamasani
334f959bf5
Merge "Deliver package broadcasts only to related profiles."
2014-05-01 21:44:08 +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
Brian Carlstrom
e3cceef7ec
am 0f7c0570: Merge "Minor cleanup of UsageStatsService"
...
* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
Minor cleanup of UsageStatsService
2014-05-01 21:41:58 +00:00
Amith Yamasani
932249db93
Deliver package broadcasts only to related profiles.
...
Store the listener's userhandle in a cookie and compare profile
relationships before delivering package broadcasts to a listener.
Basically, don't leave TODOs around, they'll result in bugs :)
Bug: 14436558
Change-Id: I57a21719caab6cf54b78de7be2eca3e398dc6288
2014-05-01 14:39:35 -07:00
Brian Carlstrom
0f7c0570e0
Merge "Minor cleanup of UsageStatsService"
2014-05-01 21:38:34 +00:00
Natalie Silvanovich
559c76dbc3
Bounds Check in onPlaySoundEffect
...
Prevents system crash
Bug: 13514877
Change-Id: Id03561779611d9eb7402ff206fd877b39bb2f035
2014-05-01 14:36:44 -07:00
Alan Viverette
43002aba7f
am bac5e8e1: Merge "Cleaning up TouchFeedbackDrawable and Ripple APIs"
...
* commit 'bac5e8e1f45129281883a517523f9a00363e07ff':
Cleaning up TouchFeedbackDrawable and Ripple APIs
2014-05-01 21:30:58 +00:00
Selim Cinek
c44ce4302d
am 1336c0c0: Merge "Opimized the number of calls to updateChildren."
...
* commit '1336c0c0381d020c65ebb297e85c874d1aa0761c':
Opimized the number of calls to updateChildren.
2014-05-01 21:27:08 +00:00