ztenghui
0d575b084f
Merge "Make sure the theta is correctly represented and incoming polygon is CW for shadow."
2014-04-29 16:21:51 +00:00
Glenn Kasten
ecdc6fdb64
Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE"
2014-04-29 16:14:43 +00:00
Selim Cinek
8efc566abf
Merge "Fixed a bug where the outline was not correctly updated"
2014-04-29 15:57:02 +00:00
Mathieu Meisser
04f8532776
Add missing character combinations for international layouts
...
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.
Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-04-29 16:52:40 +02:00
Selim Cinek
61571f1422
Fixed a bug where the outline was not correctly updated
...
The outline was not correctly copied to the field when it already
existed.
Change-Id: I02a7006f7ceff9241b1c52c73ea159c59aa7464e
2014-04-29 14:41:36 +02:00
Nicolas Prevot
627aad9c20
Merge "Small fix in DeviceOwner.java."
2014-04-29 10:35:26 +00:00
Nicolas Prevot
f2a5bf88cd
Small fix in DeviceOwner.java.
...
Change-Id: Ibfa4ae7b1bc269bc51532026f8a6cc3c75cc42bf
2014-04-29 10:43:53 +01:00
Jae Seo
19db0f036a
Merge "Dispatch input events to the TV input"
2014-04-29 06:22:00 +00:00
Jae Seo
6a6059a29e
Dispatch input events to the TV input
...
TvInputManagerService now creates an InputChannel pair and passes one
end to the app and the other end to the service. Then the TvInputManager
in the app creates an InputEventSender around one end of the channel to
send events and the service creates an InputEventReceiver around the
other end of the channel to receive events.
Most of the newly added code here was borrowed heavily from the IME.
Change-Id: I0bd83847cba0033ccb6f4b6dad267ebeaf5e9c7c
2014-04-29 14:18:55 +09:00
Elliott Hughes
a77a88e436
am 45641ecd: am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports."
...
* commit '45641ecd2c4be60390319614f519d2313dbd547d':
Fix two zygote imports.
2014-04-29 04:09:43 +00:00
Elliott Hughes
bafab83995
am c4e6f6d2: am cf939672: am 2e9d924d: Merge "Remove unused import."
...
* commit 'c4e6f6d2827ad526f562a5882975f42eee69486c':
Remove unused import.
2014-04-29 04:05:27 +00:00
Elliott Hughes
45641ecd2c
am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports."
...
* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
Fix two zygote imports.
2014-04-29 04:05:25 +00:00
Elliott Hughes
c4e6f6d282
am cf939672: am 2e9d924d: Merge "Remove unused import."
...
* commit 'cf939672f8c6e1ee29ae38f0e3665ab966491f7f':
Remove unused import.
2014-04-29 04:01:25 +00:00
Elliott Hughes
7af8f5ba9c
am 10d57c4b: Merge "Fix two zygote imports."
...
* commit '10d57c4bc7459d0c73b254af006a3528e9a0c33e':
Fix two zygote imports.
2014-04-29 04:01:01 +00:00
Elliott Hughes
cf939672f8
am 2e9d924d: Merge "Remove unused import."
...
* commit '2e9d924d4f4275c72df4be28d85482064cee43f8':
Remove unused import.
2014-04-29 03:56:19 +00:00
Elliott Hughes
10d57c4bc7
Merge "Fix two zygote imports."
2014-04-29 03:54:49 +00:00
Elliott Hughes
a9569ff70f
Fix two zygote imports.
...
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
2014-04-28 20:53:52 -07:00
Elliott Hughes
2e9d924d4f
Merge "Remove unused import."
2014-04-29 03:52:11 +00:00
Elliott Hughes
f25f14eeba
Remove unused import.
...
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
2014-04-28 20:51:34 -07:00
Elliott Hughes
c1858228df
Fix a few more stray libcore.io references.
...
Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
2014-04-28 20:49:24 -07:00
Elliott Hughes
33ee1e779d
Fix build.
...
Change-Id: I9e1a5280d3356e8814e505915bbc74200bc58b40
2014-04-28 20:45:31 -07:00
Guang Zhu
e47ebbeec6
make success explicit in BT instrumentation util
...
Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
2014-04-28 20:12:35 -07:00
Elliott Hughes
20cfa1b36c
am 3e792ef7: am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
...
* commit '3e792ef78fbad1df75e97da9a32a5826371b2da9':
Move the Zygote off libcore.os and onto android.system.
2014-04-29 02:38:02 +00:00
Elliott Hughes
3e792ef78f
am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
...
* commit 'fff28619d8f3b2fa7577c3e101d3fcd45f26f3a4':
Move the Zygote off libcore.os and onto android.system.
2014-04-29 02:34:37 +00:00
Elliott Hughes
fff28619d8
am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
...
* commit 'f4a7ac00a734343b8d2760def352cbdf99fa08c7':
Move the Zygote off libcore.os and onto android.system.
2014-04-29 02:31:34 +00:00
Elliott Hughes
f4a7ac00a7
Merge "Move the Zygote off libcore.os and onto android.system."
2014-04-29 02:28:07 +00:00
Elliott Hughes
860c5911a2
Move the Zygote off libcore.os and onto android.system.
...
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
2014-04-28 19:19:13 -07:00
Alan Viverette
b6093740db
Merge "Fix alert dialog icon"
2014-04-29 00:13:36 +00:00
Chris Craik
9103e4f748
Add Z property to View
...
Change-Id: Iff0b2fc616c650c46e5567a1cc81301afffcbfce
2014-04-28 17:00:44 -07:00
ztenghui
2e023f3827
Make sure the theta is correctly represented and incoming polygon is CW for shadow.
...
Now the theta = 0 should be on +x axis.
And cos(theta) should correctly represent x value.
Without this fix, the poly theta (from atan2) can be wrongly rotated 90 degrees.
Also, make sure the incoming polygon is CW for the shadow system.
This fix visual artifacts in recent regression for spot shadows.
bug:13553955
Change-Id: I9bbf54db094e7f133326da4dae4610962da849c1
2014-04-28 16:43:13 -07:00
Winson Chung
7a70981fc1
Merge "Fixing NPE. (Bug 14385152)"
2014-04-28 23:43:04 +00:00
Elliott Hughes
74af8b54b3
Merge "Move internal libcore.os users over to android.system."
2014-04-28 23:40:05 +00:00
Elliott Hughes
f97c63350a
Move internal libcore.os users over to android.system.
...
Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
2014-04-28 16:38:43 -07:00
Chris Craik
5830df4d59
Fix build
...
Change-Id: I4f55b27425899f25cb22d4466e3413ad27b5a302
2014-04-28 16:38:31 -07:00
Jae Seo
cdf6bd22e0
Add more URI patterns for accessing TV metadata
...
The following URI patterns are added:
content://com.android.tv/input/*/*/channel
content://com.android.tv/input/*/*/channel?browsable_only=
content://com.android.tv/channel/#/program
content://com.android.tv/channel/#/program?start_time=&end_time=
This allows us to disable user-provided selection on query/delete/update to help
avoid SQL injection.
Bug: 14133838
Change-Id: I6c86ac33cb5bc8aaa5248a80ed0f0fe0899a15b8
2014-04-29 08:28:44 +09:00
Yuling Liang
54dacbe7ca
am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
...
* commit '3914a33c01102f5de51e33d006c0aeedf2693af0':
Followon fix for 14276128 Clipping at bottom of TextView
2014-04-28 23:22:54 +00:00
Yuling Liang
3914a33c01
am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
...
* commit '26a5c2dd740f309f3168790fc55a164738963835':
Followon fix for 14276128 Clipping at bottom of TextView
2014-04-28 23:18:58 +00:00
Yuling Liang
26a5c2dd74
Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
2014-04-28 23:16:13 +00:00
David Friedman
23962cb7db
am 86318b7d: am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html " into klp-docs
...
* commit '86318b7daae6a741cf18c8a37297f978d5e5e42a':
Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
2014-04-28 23:11:36 +00:00
David Friedman
86318b7daa
am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html " into klp-docs
...
* commit '0c18705bf10e1e04fbb2b2afaf5f9537764148a5':
Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
2014-04-28 23:07:40 +00:00
Chris Craik
139349b7de
Merge "Add elevation, Z properties to View"
2014-04-28 23:03:42 +00:00
David Friedman
0c18705bf1
am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html " into klp-docs
...
* commit '3fef8e60668bb955763367ac17c1195e46b3078c':
Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
2014-04-28 23:03:25 +00:00
Eino-Ville Talvala
967c4354be
Merge "CameraDevice: Make sure log tags are within length bounds."
2014-04-28 22:28:55 +00:00
Eino-Ville Talvala
b72d1efdef
CameraDevice: Make sure log tags are within length bounds.
...
Change-Id: I93c4670c1ee0b0be5956b0ed8cd0f53873257f7c
2014-04-28 15:23:43 -07:00
Winson Chung
648c83b4ee
Fixing NPE. (Bug 14385152)
...
Change-Id: Ie6d1e7c3e5dcf721e945c4933c077fa6abb10067
2014-04-28 15:11:56 -07:00
David Friedman
3fef8e6066
am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html " into klp-docs
...
* commit '1053b2c5d43ca58e9f0fe611770b278e88c76fa3':
Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
2014-04-28 21:56:07 +00:00
David Friedman
1053b2c5d4
Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html " into klp-docs
2014-04-28 21:52:45 +00:00
Michael Wright
337d9d2edc
Move key attribute information into KeyEvent.
...
This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.
It also moves the definition for all of the key names to the native
side, rather than having them in both places.
Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
2014-04-28 14:33:40 -07:00
Chris Craik
cc39e16cb9
Add elevation, Z properties to View
...
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
2014-04-28 14:33:33 -07:00
Yorke Lee
2e9c300b91
Merge "Add setOverlay method to QuickContactsBadge"
2014-04-28 21:24:21 +00:00