John Reck
3d227674fe
am 12d8776b: am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
...
* commit '12d8776b8667946a6741f85013a24373900df830':
Protect against focus changes after .destroy()
2012-08-27 16:59:34 -07:00
John Reck
12d8776b86
am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
...
* commit 'f920271828f654dec2a72240e73a940247f25315':
Protect against focus changes after .destroy()
2012-08-27 16:57:02 -07:00
John Reck
f920271828
Merge "Protect against focus changes after .destroy()" into jb-mr1-dev
2012-08-27 16:54:18 -07:00
John Reck
1612fab07b
Protect against focus changes after .destroy()
...
Bug: 7026042
Change-Id: I656b612a4b5304225863d3100a98bf2b97d9890d
2012-08-27 16:44:39 -07:00
alanv
b72fe7a263
Don't overwrite accessibility delegates in AbsListView items.
...
Bug: 6856579
Change-Id: I2963edcefdc0dd5e1413b57858e6f319904a269d
2012-08-27 16:44:25 -07:00
Baligh Uddin
effedf422c
am dd724226: (-s ours) am 81efbb30: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'dd7242262f1c30cc380cc62e9a8c2cc8d9a054b2':
Import translations. DO NOT MERGE
2012-08-27 16:23:01 -07:00
Baligh Uddin
dd7242262f
am 81efbb30: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '81efbb30f07d3c2d48b43659dd443ceb625505d2':
Import translations. DO NOT MERGE
2012-08-27 16:21:14 -07:00
Baligh Uddin
81efbb30f0
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-27 16:17:57 -07:00
Baligh Uddin
5f18da2b8f
am e7f484f2: (-s ours) am 38b97a31: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e7f484f26d7547fe841ee7decaf74f7cbc0b53ca':
Import translations. DO NOT MERGE
2012-08-27 16:17:43 -07:00
Baligh Uddin
e6f6854b36
Merge "Import translations. DO NOT MERGE"
2012-08-27 16:16:28 -07:00
Baligh Uddin
e7f484f26d
am 38b97a31: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '38b97a316c64f094d5fc2636a6634c6f4b580ab7':
Import translations. DO NOT MERGE
2012-08-27 16:14:46 -07:00
Baligh Uddin
38b97a316c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-27 16:11:39 -07:00
Baligh Uddin
5eb7b1b9d8
Merge "Import translations. DO NOT MERGE"
2012-08-27 16:10:36 -07:00
Dianne Hackborn
4a49b0940d
am f748711d: am 0e17e5bc: Merge "Fix installing applications from non-primary users." into jb-mr1-dev
...
* commit 'f748711d7bbfa082247daeb6e67083f5797532af':
Fix installing applications from non-primary users.
2012-08-27 16:04:52 -07:00
Dianne Hackborn
f748711d7b
am 0e17e5bc: Merge "Fix installing applications from non-primary users." into jb-mr1-dev
...
* commit '0e17e5bc43373ff9dd8d567f876a26f990ed638e':
Fix installing applications from non-primary users.
2012-08-27 16:02:52 -07:00
Dianne Hackborn
0e17e5bc43
Merge "Fix installing applications from non-primary users." into jb-mr1-dev
2012-08-27 15:59:56 -07:00
Charles Chen
f743a5da0b
am 3ff601e7: am 40edfc97: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
...
* commit '3ff601e730c48252f50bc3eebdb424b4d9c5e2ca':
Reload page when A11y is on and the JavaScript state changes.
2012-08-27 15:48:19 -07:00
Charles Chen
3ff601e730
am 40edfc97: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
...
* commit '40edfc97795e34b1f24b15ca8f0ccba37fa1efbc':
Reload page when A11y is on and the JavaScript state changes.
2012-08-27 15:45:34 -07:00
Charles Chen
40edfc9779
Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev
2012-08-27 15:42:39 -07:00
The Android Open Source Project
79ad6d7591
am 92dc4a82: (-s ours) am 5b3652cc: am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit '92dc4a823050da909a06488584bb10b4de60871c':
Empty DC's apnList when the DC is free.
2012-08-27 15:22:59 -07:00
alanv
c98b34608b
Reload page when A11y is on and the JavaScript state changes.
...
Bug: 6910403
Change-Id: I85af7d2019a02c1a6cc17b0c4930276b7fb69e33
2012-08-27 15:21:09 -07:00
The Android Open Source Project
92dc4a8230
am 5b3652cc: am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit '5b3652ccc89e3f94080d810aa1149f09d221f413':
Empty DC's apnList when the DC is free.
2012-08-27 15:19:30 -07:00
Brian Muramatsu
c80c696385
am 6c0d4f00: am a97ec810: Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev
...
* commit '6c0d4f00cb6b589652e55b9e542dd0254f16ce3f':
Remove unused IntentFilter in LocationManager
2012-08-27 15:17:48 -07:00
Adam Powell
000de44012
am c7c1d174: am ac137b32: Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev
...
* commit 'c7c1d174b39ca4d81f42069799f7891de5102158':
Add setOnDismissListener to AlertDialog.Builder
2012-08-27 15:17:45 -07:00
Jeff Sharkey
c44b06d414
am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev
...
* commit 'f261d88f818df20dfd033746bd3072bd42b705c9':
Always-on VPN.
2012-08-27 15:17:41 -07:00
Dianne Hackborn
786b44046a
Fix installing applications from non-primary users.
...
We also now send the correct broadcasts to each user.
You no longer need to be running the shell as root
to be able to create/remove users.
Also added some more man page material to the pm command, and
got rid of a bunch of showUsage() calls that now make error
messages completely buried because of how large the usage info
has become.
And the package manager now shows the user each historical broadcast
was sent to.
Change-Id: Iab42498e1352a0c023069139c80fc04d2d69ab4b
2012-08-27 15:16:33 -07:00
The Android Open Source Project
5b3652ccc8
am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit 'e9c7efda14e7d1c78e465e4208fec6fb6babce5d':
Empty DC's apnList when the DC is free.
2012-08-27 15:15:25 -07:00
Brian Muramatsu
6c0d4f00cb
am a97ec810: Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev
...
* commit 'a97ec810e0dd5fe493c1ac08545dcb7a9f93b723':
Remove unused IntentFilter in LocationManager
2012-08-27 15:14:14 -07:00
Adam Powell
c7c1d174b3
am ac137b32: Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev
...
* commit 'ac137b3211818f9e72f9ffbaf541ad8a1ef27eb1':
Add setOnDismissListener to AlertDialog.Builder
2012-08-27 15:14:10 -07:00
Jeff Sharkey
f261d88f81
am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev
...
* commit '116ee10b95ffff658618be42544ce80971ce28e8':
Always-on VPN.
2012-08-27 15:14:07 -07:00
Brian Muramatsu
a97ec810e0
Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev
2012-08-27 14:59:11 -07:00
Jeff Brown
3e7e7f025e
Fix improper use of CloseGuard.
...
Change-Id: I37131a86e27a4be55956384a3566de9dcfd90fe5
2012-08-27 14:34:55 -07:00
Jeff Brown
4fd42e5a90
Remove unused "layer" argument from show().
...
Change-Id: I795edb8889bbacdf20fc54d755034040295f281a
2012-08-27 14:34:55 -07:00
Jeff Brown
64a55af0ac
Add plumbing for new surface flinger display API.
...
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.
Added JNI for all of the new surface flinger display API calls.
Enforced the requirement that all Surfaces created by
the window manager be named.
Updated the display manager service to use the new methods.
Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
2012-08-27 14:34:54 -07:00
Jeff Brown
0b722fe9ce
Use new surface flinger API.
...
Change-Id: Ic888577408a59a36481a48010e19c5e77c24e211
2012-08-27 14:34:53 -07:00
The Android Open Source Project
e9c7efda14
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325
2012-08-27 14:11:17 -07:00
Adam Powell
ac137b3211
Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev
2012-08-27 14:04:29 -07:00
Jeff Sharkey
116ee10b95
Merge "Always-on VPN." into jb-mr1-dev
2012-08-27 13:57:58 -07:00
Adam Powell
7f02dc5c9c
Add setOnDismissListener to AlertDialog.Builder
...
Add documentation to setOnCancelListener to clarify that the cancel
event plus the events for the various choice buttons are not the
exhaustive set of ways the dialog can be dismissed, and that a dismiss
listener should be used if the app needs to cover all cases of
dismissal.
Change-Id: I9e9d6f90f6f9ccaeb2c697474ab353e2d78f37b9
2012-08-27 13:53:29 -07:00
Baligh Uddin
896547e290
Import translations. DO NOT MERGE
...
Change-Id: Ifd51686337c7d36919670b3cda497941f9862589
Auto-generated-cl: translation import
2012-08-27 13:45:03 -07:00
Baligh Uddin
d4114d1aa3
Import translations. DO NOT MERGE
...
Change-Id: Ief33e8fa1f5852b5fd221fafc7bc2f7407aca6d1
Auto-generated-cl: translation import
2012-08-27 13:43:42 -07:00
Baligh Uddin
3bc7540baf
Import translations. DO NOT MERGE
...
Change-Id: I54e482c8844c2bc4a91cd3aac7efcff561c02fd6
Auto-generated-cl: translation import
2012-08-27 13:30:36 -07:00
Baligh Uddin
cbe5266a27
Import translations. DO NOT MERGE
...
Change-Id: I07901e5eab6cc8aa560d713bf84efb1774456e48
Auto-generated-cl: translation import
2012-08-27 13:23:32 -07:00
Dianne Hackborn
1ce05ed2de
am 737e99d8: am e45ca31a: am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
...
* commit '737e99d8d621bfdde810c8f9ce23b25c67ad4de4':
Fixes relative time formatting issue for dates in future
2012-08-27 13:16:13 -07:00
Jean-Baptiste Queru
3aedc4b2bf
am 1b739ade: am c77c6898: am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
...
* commit '1b739ade4b8162cfd56099504520d9d4465cd183':
Make setCaptureRate locale safe
2012-08-27 13:16:10 -07:00
Dianne Hackborn
737e99d8d6
am e45ca31a: am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
...
* commit 'e45ca31a613d8692a9db2117be96f442e57abfef':
Fixes relative time formatting issue for dates in future
2012-08-27 13:13:26 -07:00
Jean-Baptiste Queru
1b739ade4b
am c77c6898: am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
...
* commit 'c77c6898b3e0fd057d1f9d8696f467d29bc2441f':
Make setCaptureRate locale safe
2012-08-27 13:13:23 -07:00
Dianne Hackborn
e45ca31a61
am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
...
* commit 'aae4943297a08a659add964a3fef96bdfa0b2c14':
Fixes relative time formatting issue for dates in future
2012-08-27 13:10:58 -07:00
Jean-Baptiste Queru
c77c6898b3
am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"
...
* commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a':
Make setCaptureRate locale safe
2012-08-27 13:10:57 -07:00
Jeff Sharkey
69ddab4575
Always-on VPN.
...
Adds support for always-on VPN profiles, also called "lockdown." When
enabled, LockdownVpnTracker manages the netd firewall to prevent
unencrypted traffic from leaving the device. It creates narrow rules
to only allow traffic to the selected VPN server. When an egress
network becomes available, LockdownVpnTracker will try bringing up
the VPN connection, and will reconnect if disconnected.
ConnectivityService augments any NetworkInfo based on the lockdown
VPN status to help apps wait until the VPN is connected.
This feature requires that VPN profiles use an IP address for both
VPN server and DNS. It also blocks non-default APN access when
enabled. Waits for USER_PRESENT after boot to check KeyStore status.
Bug: 5756357
Change-Id: If615f206b1634000d78a8350a17e88bfcac8e0d0
2012-08-27 12:35:05 -07:00