Jeff Brown
5726e15582
am 52501786: am f2dc6fc4: Merge "Fix Javadoc." into jb-dev
...
* commit '52501786e42b386a30ee5228bbba3f65616960aa':
Fix Javadoc.
2012-04-30 17:34:59 -07:00
Jeff Brown
52501786e4
am f2dc6fc4: Merge "Fix Javadoc." into jb-dev
...
* commit 'f2dc6fc442385e08745762fcc2468ad89e2c78dc':
Fix Javadoc.
2012-04-30 17:31:23 -07:00
Jeff Sharkey
c0f032b795
am 5600bff7: am 2fea92e6: Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev
...
* commit '5600bff79fc938c8264f53d8b0f6318a11efd406':
Clear ident in dismissKeyguardOnNextActivity().
2012-04-30 17:29:09 -07:00
Jeff Brown
f2dc6fc442
Merge "Fix Javadoc." into jb-dev
2012-04-30 17:28:49 -07:00
Jeff Sharkey
5b2baad84c
am 4abe9ccb: am 4e33c6ca: Merge "Add permission for NetworkOverLimitActivity." into jb-dev
...
* commit '4abe9ccbef1c1d0c2d8ceb1f73e4ce133c950c1f':
Add permission for NetworkOverLimitActivity.
2012-04-30 17:26:06 -07:00
Jeff Sharkey
5600bff79f
am 2fea92e6: Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev
...
* commit '2fea92e6d93b02de67534a9e397a73654d74ce94':
Clear ident in dismissKeyguardOnNextActivity().
2012-04-30 17:25:29 -07:00
Jeff Brown
98447f93a0
am cee0ae50: am c5c33c36: Merge "Add support for using the lid switch to turn off the screen." into jb-dev
...
* commit 'cee0ae5037117ca2feac6137ec34645d3bf43066':
Add support for using the lid switch to turn off the screen.
2012-04-30 17:23:16 -07:00
Jeff Sharkey
4abe9ccbef
am 4e33c6ca: Merge "Add permission for NetworkOverLimitActivity." into jb-dev
...
* commit '4e33c6cafab6480bf63b083041f2b0ca09ea5f67':
Add permission for NetworkOverLimitActivity.
2012-04-30 17:22:38 -07:00
Jeff Sharkey
2fea92e6d9
Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev
2012-04-30 17:22:05 -07:00
Jamie Gennis
6fe9b60e8b
am ca1e4d77: am 6da9cf77: Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev
...
* commit 'ca1e4d7736121466509f527706bc8c7022a54cf9':
Surface: add JNI plumbing for setActiveRect.
2012-04-30 17:20:16 -07:00
Jeff Brown
cee0ae5037
am c5c33c36: Merge "Add support for using the lid switch to turn off the screen." into jb-dev
...
* commit 'c5c33c363ec9609b83dfe87d58f0bdcf99ff57a0':
Add support for using the lid switch to turn off the screen.
2012-04-30 17:19:48 -07:00
Jeff Sharkey
4e33c6cafa
Merge "Add permission for NetworkOverLimitActivity." into jb-dev
2012-04-30 17:19:35 -07:00
Jeff Brown
c5b755cd5d
Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN."
2012-04-30 17:18:44 -07:00
Ruei-sung Lin
22edf6b2e4
Fix b/5821633: Could not activate GLEnvironment
...
Change-Id: I35a05eb24299b85a869b973599a091381369aac2
2012-04-30 17:16:44 -07:00
Jamie Gennis
ca1e4d7736
am 6da9cf77: Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev
...
* commit '6da9cf7782abefe0ba3f8c389136e06a265dfb74':
Surface: add JNI plumbing for setActiveRect.
2012-04-30 17:16:37 -07:00
Jeff Brown
c5c33c363e
Merge "Add support for using the lid switch to turn off the screen." into jb-dev
2012-04-30 17:15:57 -07:00
Jeff Sharkey
e6b6533811
Add permission for NetworkOverLimitActivity.
...
Bug: 6421080
Change-Id: Icefdf3da7a4a421d27aa1449ac01ea8ae1451d49
2012-04-30 17:15:36 -07:00
Jamie Gennis
6da9cf7782
Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev
2012-04-30 17:13:45 -07:00
Jeff Sharkey
a5c89fe050
am 26d4f3dc: am 4c3de54d: Merge "Roaming always metered, relax DHCP metered check." into jb-dev
...
* commit '26d4f3dcb321e8cfb9b90181401070e54d7db282':
Roaming always metered, relax DHCP metered check.
2012-04-30 17:11:09 -07:00
Jeff Sharkey
26d4f3dcb3
am 4c3de54d: Merge "Roaming always metered, relax DHCP metered check." into jb-dev
...
* commit '4c3de54daa4ba0dadefc6eae9beb84c15da8d867':
Roaming always metered, relax DHCP metered check.
2012-04-30 17:08:33 -07:00
Jeff Sharkey
4c3de54daa
Merge "Roaming always metered, relax DHCP metered check." into jb-dev
2012-04-30 17:06:09 -07:00
Adam Powell
6f663c1a3c
Fix a bug in ListView where touch scrolling could skip a data set change
...
Bug 2597058
ListView's touch scrolling can query the adapter for new views. As we now
flush pending touch events before running layout/draw traversals (when we
normally bring ListView back in sync), this can now happen more often.
Resync data before executing a scroll if a data set change is pending.
Change-Id: I3e4eba4c2537911ba9cb3393ee4d9e68e46f84bb
2012-04-30 17:01:07 -07:00
Jeff Sharkey
7ffaa98539
Clear ident in dismissKeyguardOnNextActivity().
...
BaseStatusBar uses this to launch activities over the insecure
lockscreen, so clear identity.
Bug: 6414983
Change-Id: Idf578923285ee1344e6e13e7f51e17a5f2005c75
2012-04-30 16:59:05 -07:00
Svetoslav Ganov
e9bda15f87
AccessibilityNodeInfo.getActionSymbolicName() is missing A11y focus actions.
...
1. The new actions were not added to this helper method so it was
throwing an InvalidArgumentException.
bug:6421059
Change-Id: I132348a50bb900ee19b95cc92c26ce47609ccb1c
2012-04-30 16:55:24 -07:00
Svetoslav Ganov
cf8a3b8224
Accessibility should not change input focus behavior.
...
1. Removed a change in the input focus behavior I forgot
to take out when submitted the main accessibility focus
patch. Ugh..
bug:6320098
Change-Id: Id7942e8aac64ba4bf6df7e19f733fa70b368d1bb
2012-04-30 16:50:14 -07:00
Andreas Huber
dadd97bb88
am ae90948b: am faac9294: Merge "New API to set the video rendering mode on a MediaCodec instance." into jb-dev
...
* commit 'ae90948bf3e4cdbbaf19e8b71058dfafb06d6b70':
New API to set the video rendering mode on a MediaCodec instance.
2012-04-30 16:46:07 -07:00
Andreas Huber
ae90948bf3
am faac9294: Merge "New API to set the video rendering mode on a MediaCodec instance." into jb-dev
...
* commit 'faac92942c50b12edada5e92e7c323609b2bdb5f':
New API to set the video rendering mode on a MediaCodec instance.
2012-04-30 16:41:40 -07:00
Andreas Huber
faac92942c
Merge "New API to set the video rendering mode on a MediaCodec instance." into jb-dev
2012-04-30 16:38:54 -07:00
Dianne Hackborn
d44713a63d
Fix issue #6234928 : android.app.IntentReceiverLeaked:
...
Activity com.android.internal.app.ChooserActivity has leaked IntentReceiver
Change-Id: I02488931d8c02ecbe0c6fc2f7ce708a9dc406f67
2012-04-30 16:34:46 -07:00
Amith Yamasani
f9638a4aee
Fixes PreferenceScreen padding and scrollbar position.
...
Bug: 6399996
Changed the scrollbarStyle for tablets
Bug: 6405440
Inflate the listview from a layout with padding.
Change-Id: I838bb073ee2f0e23ac7163cc632679278dbccf05
2012-04-30 16:32:39 -07:00
Jeff Brown
32c8113510
Fix Javadoc.
...
Bug: 6418632
Change-Id: Ib17218c413cbdf26bab19ccd873de33e67dd3397
2012-04-30 16:28:32 -07:00
Jeff Sharkey
7929e8b053
am e74df9eb: am a549218e: Merge "Avoid showing popup when View detatched." into jb-dev
...
* commit 'e74df9ebf61db919ecd5bd4589c8688536e132f4':
Avoid showing popup when View detatched.
2012-04-30 16:13:20 -07:00
Jeff Sharkey
75158896fc
am 7c3e7ad2: am 59839e0f: Merge "Change permission enforcement through pm command." into jb-dev
...
* commit '7c3e7ad288411ececfbd640939ffc472f31bdd9c':
Change permission enforcement through pm command.
2012-04-30 16:13:18 -07:00
Jeff Sharkey
e74df9ebf6
am a549218e: Merge "Avoid showing popup when View detatched." into jb-dev
...
* commit 'a549218e43c40fea6333c7bb7c3d40e803bfe5a9':
Avoid showing popup when View detatched.
2012-04-30 16:10:25 -07:00
Jeff Sharkey
7c3e7ad288
am 59839e0f: Merge "Change permission enforcement through pm command." into jb-dev
...
* commit '59839e0f7cd17ec6fca6aa210276e5e3bacaed4e':
Change permission enforcement through pm command.
2012-04-30 16:10:24 -07:00
Adam Powell
f3eb2e2b28
am 9e652c30: am 9b2a0f16: Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev
...
* commit '9e652c300836af2c6c364c7d18cbcdb205efa276':
Fix a bug with updating extras in a PendingIntent with an intent stack
2012-04-30 16:10:19 -07:00
Michael Jurka
22c415a300
am e3d83e55: am 029abfdc: Merge "Fix NPE" into jb-dev
...
* commit 'e3d83e5523bbbb7f30b3b7ca11571cc45749aa20':
Fix NPE
2012-04-30 16:07:30 -07:00
Dianne Hackborn
8d06ee51f8
am f823a76d: am 2218f6c2: Merge "Fix issue #6111771 : Run-time Restart observed when signing in with an existing account" into jb-dev
...
* commit 'f823a76d5c78a399340581e52b76f55fbcd4248e':
Fix issue #6111771 : Run-time Restart observed when signing in with an existing account
2012-04-30 16:07:28 -07:00
Adam Powell
9e652c3008
am 9b2a0f16: Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev
...
* commit '9b2a0f167e8445d14e933176ba67b01862809577':
Fix a bug with updating extras in a PendingIntent with an intent stack
2012-04-30 16:07:00 -07:00
Jeff Sharkey
a549218e43
Merge "Avoid showing popup when View detatched." into jb-dev
2012-04-30 16:06:27 -07:00
Jeff Sharkey
59839e0f7c
Merge "Change permission enforcement through pm command." into jb-dev
2012-04-30 16:06:21 -07:00
Dianne Hackborn
00b0a5fbe5
am ac3f02ab: am 53fadc59: Merge "Fix scaling of layout bounds." into jb-dev
...
* commit 'ac3f02ab619edaec83e9e0d07c56e7b19c12cd9d':
Fix scaling of layout bounds.
2012-04-30 16:04:38 -07:00
Adam Powell
9b2a0f167e
Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev
2012-04-30 16:04:11 -07:00
Michael Jurka
e3d83e5523
am 029abfdc: Merge "Fix NPE" into jb-dev
...
* commit '029abfdc66da33e2fe23c21a3452598aa2ac902a':
Fix NPE
2012-04-30 16:02:52 -07:00
Dianne Hackborn
f823a76d5c
am 2218f6c2: Merge "Fix issue #6111771 : Run-time Restart observed when signing in with an existing account" into jb-dev
...
* commit '2218f6c2340f2cf240af4bfce883a3b80371a0b6':
Fix issue #6111771 : Run-time Restart observed when signing in with an existing account
2012-04-30 16:02:50 -07:00
Dianne Hackborn
ac3f02ab61
am 53fadc59: Merge "Fix scaling of layout bounds." into jb-dev
...
* commit '53fadc5965ae5668565500d0f0f05e88acacc486':
Fix scaling of layout bounds.
2012-04-30 15:59:50 -07:00
Jeff Sharkey
f166f480f0
Roaming always metered, relax DHCP metered check.
...
Always treat roaming connections as metered, and relax DHCP test to
match any substring for forward compatibility.
Bug: 6382737, 6375399
Change-Id: I9781a60f55fbe35da6f8bfc7a1d609608e8f0951
2012-04-30 15:59:21 -07:00
Irfan Sheriff
0786f753f3
am 5c41fe8d: am 8e8798d9: Merge "Fix connect & save of invalid networks" into jb-dev
...
* commit '5c41fe8d75bd58a55bcf2c6c1d25cea9ddc03db4':
Fix connect & save of invalid networks
2012-04-30 15:58:58 -07:00
Michael Jurka
029abfdc66
Merge "Fix NPE" into jb-dev
2012-04-30 15:58:51 -07:00
Dianne Hackborn
2218f6c234
Merge "Fix issue #6111771 : Run-time Restart observed when signing in with an existing account" into jb-dev
2012-04-30 15:58:22 -07:00