Wink Saville
44b43a51c7
am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
...
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
GlobalActions: Fix Airplane Mode on/off issue
2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198
Merge "GlobalActions: Fix Airplane Mode on/off issue"
2014-03-30 00:15:22 +00:00
John Reck
0d1f634f4b
Add invokeFunctor
...
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
2014-03-28 20:57:32 -07:00
Wei Wang
ab4fc115e9
am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
Callback on correct method when status is unsuccessful.
2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a
am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709
Callback on correct method when status is unsuccessful.
...
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
John Reck
c75db8266b
Merge "Remove kStatusInvoke & kStatusDraw"
2014-03-29 01:41:50 +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
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
69a30b5e54
Merge "Simplify RenderNode refresh/build/update process"
2014-03-29 00:07:07 +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
nagarw
c3b7e6fd44
GlobalActions: Fix Airplane Mode on/off issue
...
Issue: Unable to turn off Airplane mode from power button
after phone reboot
Fix: Initialize mHasTelephony before the PhoneStateListener is
registered to the TelephonyManager so that correct value
of mHasTelephony is reflected when onServiceStateChanged
callback is called.
Bug: 13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
2014-03-28 16:54:58 -07:00
Alan Viverette
78efdbac8a
Fix drag-to-open forwarding behavior
...
BUG: 13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
2014-03-28 16:53:56 -07:00
Glenn Kasten
37967d46f4
Use memcpy_to_i16_from_u8 from audioutils instead of C loop
...
This function may be optimized in the future,
and it will make it easier to search for audio sample
format-specific code when we need add support for more formats.
Change-Id: Iad0585c35ddd2d12857164ed1effcce75f77920c
2014-03-28 16:52:40 -07:00
John Reck
750ca6dbdb
Remove kStatusInvoke & kStatusDraw
...
They are unused
Change-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e
2014-03-28 16:43:15 -07: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
b4f27c95bc
Merge "Support for new gTLDs"
2014-03-28 23:35:10 +00:00
Glenn Kasten
c5d142428a
Use set() return value instead of separate call to initCheck()
...
Change-Id: I6874ca00512d30824ecec10b8dc289993b985c7b
2014-03-28 16:32:10 -07: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
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
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
Glenn Kasten
5b8fd44365
AudioTrack and AudioRecord JNI cleanup
...
Rename nbChannels to our conventional channelCount,
which should make code searches easier.
Change-Id: I3c2791db302558a15bc8be198b6f3d482e0e0055
2014-03-28 15:44:45 -07:00
Glenn Kasten
2fbf25b50f
Fix warnings
...
Change-Id: Ie00f6c58a944e2db0539f1119d2983a483b6f10c
2014-03-28 15:42:29 -07:00
Chris Craik
5db60e0eb7
Merge "Support shadows on the root RenderNode"
2014-03-28 22:33:56 +00:00
Alan Viverette
351f0c1d26
Remove unthemed drawable cache, since canApplyTheme != isThemed
...
Change-Id: I460673bfa491e67ea239f8ebb03898a0633e7565
2014-03-28 15:25:27 -07: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
Glenn Kasten
167d1a2771
Fix typo
...
Change-Id: I7c2fb560b8d8778afad237aadd97e8e94dd865e7
2014-03-28 15:22:11 -07:00
Aaron Whyte
f10d0399bf
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.
Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
2014-03-28 22:21:55 +00:00