John Reck
cdf66b72ec
am 29277c8c: Merge "RenderThread animator support"
...
* commit '29277c8c85092e3da9362cb62e96dae0ba4fec5e':
RenderThread animator support
2014-04-29 17:58:48 +00:00
John Reck
25ff2c1ec1
Merge "RenderThread animator support"
2014-04-29 17:56:04 +00:00
John Reck
e45b1fd03b
RenderThread animator support
...
Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
2014-04-29 10:42:11 -07:00
Selim Cinek
f9dbfbf36a
am f7175d79: Merge "Fixed a bug where the outline was not correctly updated"
...
* commit 'f7175d7952f0d3a8d9bc501e57b11a5c68b28e07':
Fixed a bug where the outline was not correctly updated
2014-04-29 16:02:21 +00:00
Selim Cinek
8efc566abf
Merge "Fixed a bug where the outline was not correctly updated"
2014-04-29 15:57:02 +00: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
Jae Seo
e115c5ec83
am 6b60d5ea: Merge "Dispatch input events to the TV input"
...
* commit '6b60d5ea3df01024069f8f7374251e0e2eee1e47':
Dispatch input events to the TV input
2014-04-29 07:35:29 +00: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
Yuling Liang
f2231eb0a1
am de4054bb: am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
...
* commit 'de4054bba780e67d2f24ba52c5bc8e5a16d5bddc':
Followon fix for 14276128 Clipping at bottom of TextView
2014-04-28 23:28:36 +00: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
Chris Craik
ceeccd434c
am 40310481: Merge "Add elevation, Z properties to View"
...
* commit '403104813cb424ae28df6b4245bafaab21969917':
Add elevation, Z properties to View
2014-04-28 23:07:59 +00:00
Chris Craik
139349b7de
Merge "Add elevation, Z properties to View"
2014-04-28 23:03:42 +00:00
Eino-Ville Talvala
81356bb398
am b79b4307: Merge "CameraDevice: Make sure log tags are within length bounds."
...
* commit 'b79b4307983c43614a5cd35a08c8444493abae79':
CameraDevice: Make sure log tags are within length bounds.
2014-04-28 22:33:57 +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
Chris Craik
cc39e16cb9
Add elevation, Z properties to View
...
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
2014-04-28 14:33:33 -07:00
Yorke Lee
fedd55a424
am a6521d78: Merge "Add setOverlay method to QuickContactsBadge"
...
* commit 'a6521d78a4ce3c273b241eed214c85ec12a30d32':
Add setOverlay method to QuickContactsBadge
2014-04-28 21:31:31 +00:00
Griff Hazen
48f04a845b
am 58ba9f2d: am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
* commit '58ba9f2db123e216a262fae5e276ec9f394e42f8':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 21:31:24 +00:00
Adam Lesinski
448b130c12
am d15388df: Merge "Merge commit \'734a78fb\' into manualmerge"
...
* commit 'd15388dfe12938c95f52aba1cb41ec58ad1e5e84':
Various CTS fixes
2014-04-28 21:31:21 +00:00
Yorke Lee
2e9c300b91
Merge "Add setOverlay method to QuickContactsBadge"
2014-04-28 21:24:21 +00:00
Bo Liu
3a915af6a2
am caffba94: Merge "Add invokeFunctor call to ViewRootImpl"
...
* commit 'caffba94e9e7cf8a798675b05815e578cbe72ffd':
Add invokeFunctor call to ViewRootImpl
2014-04-28 21:22:17 +00:00
Elliott Hughes
d9e6101862
am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master
...
* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
Track libcore.os' move to android.system.
2014-04-28 21:22:01 +00:00
Griff Hazen
7c12112d62
am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
* commit 'e638b84436caeea8d54b560c0b883ef599ba328d':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 21:21:10 +00:00
Adam Lesinski
1ebf4ef188
Merge "Merge commit '734a78fb' into manualmerge"
2014-04-28 21:20:01 +00:00
Bo Liu
802667b20b
Merge "Add invokeFunctor call to ViewRootImpl"
2014-04-28 21:16:14 +00:00
Adam Lesinski
e929bee9bb
Merge commit '734a78fb' into manualmerge
...
Conflicts:
core/java/android/app/WallpaperManager.java
Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3
2014-04-28 14:15:06 -07:00
Yorke Lee
a702ccdf9f
Add setOverlay method to QuickContactsBadge
...
Allow apps to disable/configure their own overlay to be used
on the QuickContactsBadge
Bug: 13747208
Change-Id: Id84c6ee1ebde6ce17477c12d22522ca19c27ea9b
2014-04-28 13:57:04 -07:00
Elliott Hughes
10596fbcce
resolved conflicts for merge of 3ce4f3d0 to master
...
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Bo Liu
ae738a7a45
Add invokeFunctor call to ViewRootImpl
...
BUG: 13961296
Change-Id: Ief8eea0b4c79a64ea76d75daaec176f1b8438581
2014-04-28 13:41:18 -07:00
Yohei Yukawa
8f6278df67
am 5fe51516: Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT"
...
* commit '5fe51516d07dc1a4fb54c968b7f11c4a6f4b8cbf':
Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT
2014-04-28 20:38:21 +00:00
Mathieu Chartier
d122c94931
am d4b2046e: am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
...
* commit 'd4b2046efbfa300263df5c0901b7b24c97bf11cd':
Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 20:38:15 +00:00
Yohei Yukawa
2fe02f8a6e
am a11b97b4: Merge "Return the cursor position in screen coordinates"
...
* commit 'a11b97b4c7fea2fb1c61fa74c217db789a0f9e54':
Return the cursor position in screen coordinates
2014-04-28 20:38:03 +00:00
Dianne Hackborn
99a58b0e3a
am c60f1877: Merge "Rework some of the voice interaction APIs."
...
* commit 'c60f1877896e795a6add525ee36770e3aa77dc29':
Rework some of the voice interaction APIs.
2014-04-28 20:37:33 +00:00
Griff Hazen
e638b84436
am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
* commit '3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:37:24 +00:00
Yohei Yukawa
b609ea3884
Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT"
2014-04-28 20:33:26 +00:00
Griff Hazen
3c5a6cf935
am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:33:22 +00:00
Adam Lesinski
734a78fb86
am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev
...
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
Various CTS fixes
2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122
Merge "Various CTS fixes" into klp-modular-dev
2014-04-28 20:30:35 +00:00
Griff Hazen
2c6131bba9
am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:29:12 +00:00
Mathieu Chartier
ce4c6218a6
am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
...
* commit 'c6d0dc896438d8918f4f985513e92be9b4d69e87':
Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 20:03:38 +00:00
Yohei Yukawa
c644ff6d4f
Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT
...
This is a follow-up CL for I3acf2317ae1d763d11 to improve the
Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT
BUG: 14323360
Change-Id: Ie8948eda3ce57da282bd82e8e9a44997f6d53245
2014-04-29 05:01:08 +09:00
Yohei Yukawa
985fd3063c
Merge "Return the cursor position in screen coordinates"
2014-04-28 19:17:05 +00:00
Yohei Yukawa
4de04795f9
Return the cursor position in screen coordinates
...
From its beginning, InputMethodService#onUpdateCursor has
provided the cursor position in local coordinates in the attached
view. However, the local coordinates is not useful for IMEs
to render a floating UI near the cursor because the IME is not
able to know the origin of the attached view.
With this CL, CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT also means
that the IME will receive the cursor position in screen
coordinates. Because this is a new constant in the next release,
conditionally changing the coordinates never causes
compatibility issues as long as its behavior is well documented.
BUG: 14323360
Change-Id: I3acf2317ae1d763d11dae5ef73c2a1348b377c71
2014-04-29 03:53:34 +09:00
Elliott Hughes
3ce4f3d0af
am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
...
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Mathieu Chartier
c6d0dc8964
am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
...
* commit '18582a827c3f908cd75e1d9c189c554f42415a4a':
Use Runtime.gc instead of System.gc for DDMS.
2014-04-28 18:36:44 +00:00
Dianne Hackborn
fb875cb028
Merge "Rework some of the voice interaction APIs."
2014-04-28 18:28:06 +00:00
Elliott Hughes
bbd87eb919
Merge "Track libcore.os' move to android.system."
2014-04-28 18:14:00 +00:00