John Reck
00bd466ac4
am 903d6407: Merge "Remove DisplayList.java"
...
* commit '903d6407b0f5fcf12373daadcce90aaad44a5491':
Remove DisplayList.java
2014-03-29 01:45:01 +00:00
Chris Craik
d17f243598
am 42dda81e: Merge "Update several stale RenderNode variable names"
...
* commit '42dda81e15490193fe5a9d10464dd9049c3362cc':
Update several stale RenderNode variable names
2014-03-29 01:44:58 +00:00
John Reck
903d6407b0
Merge "Remove DisplayList.java"
2014-03-29 01:41:44 +00:00
Chris Craik
42dda81e15
Merge "Update several stale RenderNode variable names"
2014-03-29 01:39:57 +00:00
Michael Wright
151bea7521
am 84ad5d88: am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '84ad5d8891d3a6921b9cfd1329022840682d55e2':
Add InputDevice#supportsSource(int).
2014-03-29 01:14:33 +00:00
Michael Wright
6d4a27a297
am 16ff04ca: am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit '16ff04ca38739350cf398c4081cfbf13cac33a9d':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 01:14:30 +00:00
Chris Craik
64a12e177d
Update several stale RenderNode variable names
...
Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b
2014-03-28 18:12:12 -07:00
Michael Wright
84ad5d8891
am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
Add InputDevice#supportsSource(int).
2014-03-29 01:09:30 +00:00
Michael Wright
16ff04ca38
am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit '4669cfff1ed590087eade846aee8b4ef58f31739':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 01:09:27 +00:00
Michael Wright
5d7db503bd
am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Chris Craik
a4a17246e3
am 69a30b5e: Merge "Simplify RenderNode refresh/build/update process"
...
* commit '69a30b5e549e9da545e3545391e6027d9822e022':
Simplify RenderNode refresh/build/update process
2014-03-29 00:12:37 +00:00
Chris Craik
69a30b5e54
Merge "Simplify RenderNode refresh/build/update process"
2014-03-29 00:07:07 +00:00
Alan Viverette
fa3b429967
am efaf51ad: Merge "Fix drag-to-open forwarding behavior"
...
* commit 'efaf51ad0cb7a371aefe9ac7e08bff637ba59021':
Fix drag-to-open forwarding behavior
2014-03-29 00:03:25 +00:00
Chris Craik
df0c431e6c
Simplify RenderNode refresh/build/update process
...
A View's RenderNode is created lazily, but the instance never changes
afterward.
Change-Id: I0b05769cd49aa55061d3fb8c2ea55a04e8391e48
2014-03-28 17:03:12 -07:00
Alan Viverette
efaf51ad0c
Merge "Fix drag-to-open forwarding behavior"
2014-03-28 23:59:39 +00:00
Alan Viverette
78efdbac8a
Fix drag-to-open forwarding behavior
...
BUG: 13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
2014-03-28 16:53:56 -07:00
Jeff Hao
d719a5bece
am 7d89b85f: am f1354dd2: am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
...
* commit '7d89b85f499331523e6c976edbd2919603ab9f69':
Mark constructor as accessible in LayoutInflater.
2014-03-28 23:46:14 +00:00
Craig Mautner
77626b190a
am 71888f54: am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
...
* commit '71888f54cb256f0d5527e2dd66f95e83992d795f':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
2014-03-28 23:46:11 +00:00
Michael Wright
0e4ee514b0
am 7ef7ef0e: am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit '7ef7ef0e05736698d44876f3e51b841a2dac9be1':
Add support for additional international keyboard mappings
2014-03-28 23:46:08 +00:00
Craig Mautner
0839a55bbd
am 4377086f: am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
...
* commit '4377086f9412ab61f67907e9f1d487a45def5ac5':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
2014-03-28 23:46:06 +00:00
Adam Hampson
88b6ebec9d
am 6f9bddc8: am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
...
* commit '6f9bddc846e2915d1b1db2310a785be8ab7c91a6':
hdmi: cec: add permission name to dump permission denial message
2014-03-28 23:46:03 +00:00
Aaron Whyte
c693c6a96d
am 868f373b: am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted
...
* commit '868f373b65200ace63b143da60a270bb18903d82':
Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
2014-03-28 23:46:00 +00:00
Jeff Hao
7d89b85f49
am f1354dd2: am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
...
* commit 'f1354dd206a74e1475e8c1f8682dfd9d5e146f00':
Mark constructor as accessible in LayoutInflater.
2014-03-28 23:40:36 +00:00
Craig Mautner
71888f54cb
am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
...
* commit '1872ce3e7af0e2130a9e8f9f52983cd234f6ead0':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
2014-03-28 23:40:33 +00:00
Michael Wright
7ef7ef0e05
am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit 'c9b937bbfae825e32158e06ca52f320ca3d6f464':
Add support for additional international keyboard mappings
2014-03-28 23:40:30 +00:00
Craig Mautner
4377086f94
am 9c99c55d: (-s ours) am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
...
* commit '9c99c55d03a66ad5ba47584340c527c0f843bbe8':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
2014-03-28 23:40:27 +00:00
Adam Hampson
6f9bddc846
am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
...
* commit 'e8609de4fb3635ab7182283e94ac56b48c07463a':
hdmi: cec: add permission name to dump permission denial message
2014-03-28 23:40:23 +00:00
Aaron Whyte
868f373b65
am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public k
...
* commit '23fd13de62762e98c32f2b7525f01f0bcdf416fd':
Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
2014-03-28 23:40:13 +00:00
Selim Gurun
98942087da
am b4f27c95: Merge "Support for new gTLDs"
...
* commit 'b4f27c95bcfd4ceb5ced42efcf20bcd2faa2b626':
Support for new gTLDs
2014-03-28 23:38:55 +00:00
Selim Gurun
b4f27c95bc
Merge "Support for new gTLDs"
2014-03-28 23:35:10 +00:00
John Reck
673a784c60
Remove DisplayList.java
...
Bug: 13478302
Change-Id: I88574ec585b7eb165f3009a4f0492c12f70d3513
2014-03-28 23:19:52 +00:00
Jeff Hao
f1354dd206
am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
...
* commit 'd648e5f7ba26fc835c0448740f33c49874d51a3b':
Mark constructor as accessible in LayoutInflater.
2014-03-28 23:05:46 +00:00
Craig Mautner
1872ce3e7a
am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
...
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
2014-03-28 23:05:42 +00:00
Michael Wright
c9b937bbfa
am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"
...
* commit '6a14146b379b33a6bf947f02b2550fa97c5619b6':
Add support for additional international keyboard mappings
2014-03-28 23:05:36 +00:00
Craig Mautner
9c99c55d03
am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
...
* commit '9395dab7c38d540bea926307c448d5cc5032ac7d':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
2014-03-28 23:05:33 +00:00
Fabrice Di Meglio
4d46742820
am c0469c00: Merge "SearchView improvement for IME"
...
* commit 'c0469c00bfd0701d8a8bce9e600cf90a0e60ba98':
SearchView improvement for IME
2014-03-28 23:04:47 +00:00
Adam Hampson
e8609de4fb
am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
...
* commit '594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
hdmi: cec: add permission name to dump permission denial message
2014-03-28 23:04:01 +00:00
Aaron Whyte
23fd13de62
am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
...
* commit 'f10d0399bf5f519dff414a9d195a0eaacb37f9b7':
Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
2014-03-28 23:03:56 +00:00
Fabrice Di Meglio
c0469c00bf
Merge "SearchView improvement for IME"
2014-03-28 23:01:59 +00:00
Yuhao Zheng
d0082eaca1
am 93627ac8: Merge "Wifi hotspot stack initial hook up"
...
* commit '93627ac86c3805aaf545501b586bbca4fbc259e9':
Wifi hotspot stack initial hook up
2014-03-28 23:01:16 +00:00
Chris Craik
402272b7e7
am 5db60e0e: Merge "Support shadows on the root RenderNode"
...
* commit '5db60e0eb7dc80034f75dafcb8b16b99f5c6e6d5':
Support shadows on the root RenderNode
2014-03-28 23:01:13 +00:00
Alan Viverette
916e86161a
am e1e06ce8: Merge "Make Widget.Holo.Light.Button.Borderless style public"
...
* commit 'e1e06ce84bc3c71a9e1ebb4f55ea68c19d2b9dfb':
Make Widget.Holo.Light.Button.Borderless style public
2014-03-28 23:01:10 +00:00
Fabrice Di Meglio
2182f2aaf4
SearchView improvement for IME
...
- fix IME not closing when not having a SearchableInfo
Change-Id: I3e6e168be1e26138fe0ceb967bbd12fa35db0903
2014-03-28 15:56:51 -07:00
Yuhao Zheng
93627ac86c
Merge "Wifi hotspot stack initial hook up"
2014-03-28 22:49:51 +00:00
Chris Craik
5db60e0eb7
Merge "Support shadows on the root RenderNode"
2014-03-28 22:33:56 +00:00
Adam Hampson
594c73fc57
Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
2014-03-28 22:22:52 +00:00
Alan Viverette
e1e06ce84b
Merge "Make Widget.Holo.Light.Button.Borderless style public"
2014-03-28 22:22:22 +00:00