Fabrice Di Meglio
e549a602a3
am af26ac31: am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
...
* commit 'af26ac3130c0e956e28443d6e42212b02d4da611':
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:38:18 -07:00
Fabrice Di Meglio
af26ac3130
am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
...
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
68a9e6d222
am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
...
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:35:31 -07:00
Fabrice Di Meglio
398a6713c3
Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
2012-10-19 11:33:01 -07:00
Jeff Sharkey
45dec78cde
am e4109957: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
...
* commit 'e4109957ecaabf1e6843a4cde4dcfac9d37fef23':
Parcel VpnProfile without using disk format.
2012-10-19 11:18:22 -07:00
Jeff Sharkey
e4109957ec
am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
...
* commit 'ba0372db366e63fa928ba83f3ad8c064c51ac8e0':
Parcel VpnProfile without using disk format.
2012-10-19 11:16:41 -07:00
Jeff Sharkey
17671ff044
am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
...
* commit 'ba0372db366e63fa928ba83f3ad8c064c51ac8e0':
Parcel VpnProfile without using disk format.
2012-10-19 11:16:18 -07:00
Jeff Sharkey
ba0372db36
Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
2012-10-19 11:12:59 -07:00
John Spurlock
01d2c64ab2
am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '7404f28b11e386a42b67ec8afcc9823f2bd03c2b':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:05:23 -07:00
John Spurlock
7404f28b11
am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:02:40 -07:00
John Spurlock
fd88c25725
am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
...
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:02:11 -07:00
John Spurlock
8c82025650
Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
2012-10-19 11:00:00 -07:00
Jeff Sharkey
6e7aa77565
Parcel VpnProfile without using disk format.
...
The on-disk format of VpnProfile only stores the username/password
when saveLogin is set, which was dropping them across IPC boundaries.
Bug: 7378327
Change-Id: I30c16efb358ab8f8d3d9229bbf9811146fe034ce
2012-10-19 10:48:11 -07:00
Romain Guy
be432fa01c
am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit 'eb78cf538f87301c1612bf081ae2d5f93cae50f0':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:45:41 -07:00
Romain Guy
eb78cf538f
am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:43:04 -07:00
Romain Guy
ede7409015
am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
...
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:42:25 -07:00
Romain Guy
8b946c055d
Merge "Defer layer rendering to avoid stalls Bug #7326824 " into jb-mr1-dev
2012-10-19 10:40:28 -07:00
Craig Mautner
59a9cc18f3
am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '444354d2c62de37b65782f15c864af21086b4b04':
Allow getDisplayContentLocked to return null...
2012-10-19 09:32:19 -07:00
Craig Mautner
444354d2c6
am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
Allow getDisplayContentLocked to return null...
2012-10-19 09:30:06 -07:00
Craig Mautner
561253f04d
am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
...
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
Allow getDisplayContentLocked to return null...
2012-10-19 09:29:28 -07:00
Craig Mautner
0ed07a0a30
Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
2012-10-19 09:27:06 -07:00
John Spurlock
ed108f3d12
Frameworks base: Promote dream setting defaults to config.
...
So that:
- the values can be shared (to fix assoc bug)
- the values can be customized in product overlays
Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
2012-10-19 11:32:03 -04:00
Geremy Condra
2660fd2b5d
am 01e99ada: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
...
* commit '01e99adaed17445ef01627fe841fc37f1f474d7b':
Change android.permission.SERIAL_PORT to signature|system.
2012-10-19 00:05:39 -07:00
Geremy Condra
b81cedad5e
am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
...
* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
Change android.permission.SERIAL_PORT to signature|system.
2012-10-19 00:03:17 -07:00
Geremy Condra
01e99adaed
am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
...
* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
Change android.permission.SERIAL_PORT to signature|system.
2012-10-19 00:02:41 -07:00
Geremy Condra
a1f739ea83
Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev
2012-10-18 23:59:37 -07:00
Dave Burke
b1f434c16e
am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
...
* commit '744b4dca34e605b80e553a34327067abc862a320':
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
2012-10-18 21:07:52 -07:00
Dave Burke
2a808f971f
am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
...
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
2012-10-18 21:05:30 -07:00
Dave Burke
744b4dca34
am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
...
* commit '09a5321c60c02d944684abb98e0daec9dd810fab':
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
2012-10-18 21:05:29 -07:00
Dave Burke
09a5321c60
Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev
2012-10-18 21:02:13 -07:00
Dave Burke
579e14016c
Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""
...
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11
Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
b003e28c1d
Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
...
- set the popup layout direction depending on the anchor view's layout direction
(if not defined before)
- make first pass of ViewRootImpl.performTraversals() and configuration update
not override any layout direction that could have been set before
Change-Id: I8e86ca805f0caf52c058d06aa7861df56fb862e6
2012-10-18 18:02:56 -07:00
Kenny Root
cea3743499
Try to free cache before giving up on install
...
Try to get installd to free up cache before giving up when there is too
little space free.
Bug: 7232123
Change-Id: Ie3c8ca8dfc190abbb9a29a7baee31f32e9de7d69
2012-10-18 17:21:59 -07:00
Fabrice Di Meglio
4c2db5f2a5
am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '8de328c996a9f3a8f5ca3ea8e7c47421dd09b9aa':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:27:09 -07:00
Fabrice Di Meglio
8de328c996
am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
afb856f2aa
am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:24:07 -07:00
Fabrice Di Meglio
45c77ca0f6
Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
2012-10-18 16:20:36 -07:00
Fabrice Di Meglio
1e0ed6b232
Fix missing @hide on ViewGroup.resolveLayoutParams()
...
- as we dont need this to be public
Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
2012-10-18 16:06:52 -07:00
Fabrice Di Meglio
6cb9d909f0
am 8c2bc7cc: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
...
* commit '8c2bc7ccf16f201c10e1a4ffb66f66af63f85a91':
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
2012-10-18 15:29:12 -07:00
Fabrice Di Meglio
8c2bc7ccf1
am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
...
* commit '07f85fecdd9f13a617953c7377ff62b4133b4e30':
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
2012-10-18 15:26:29 -07:00
Fabrice Di Meglio
78c66c993f
am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
...
* commit '07f85fecdd9f13a617953c7377ff62b4133b4e30':
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
2012-10-18 15:26:26 -07:00
Fabrice Di Meglio
07f85fecdd
Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
2012-10-18 15:23:41 -07:00
Kenny Root
a3e90798b7
Robustly add symlink and add for non-primary users
...
Amazingly, some apps still don't use the nativeLibraryPath. So add a lib
symlink for non-primary users to fix that.
Also, there was an error when the symlink existed that it would give up.
This shouldn't really happen, but in that case, just remove it and
create a new one to be safe.
Also, move the downgrade code to the appropriate place. This downgrade
case triggered the above symlink existing bug.
Bug: 7318366
Bug: 7371571
Change-Id: Ia175b36d98f00bdc2f2433b909aafd524eb34d15
2012-10-18 15:12:09 -07:00
Romain Guy
7c25aab491
Defer layer rendering to avoid stalls
...
Bug #7326824
When a layer is taken out of the cache and initialized it gets cleared
to prepare it for future rendering. This triggers the following sequence
of operations:
glBindFramebuffer(layer.fbo)
attach texture storage to FBO
glClear()
glBindFramebuffer(defaultFbo)
The clear forces a resolve on tilers which stalls the CPU for a little
while, thus producing jank during animations. This change moves the
clear to the next frame when we know we will have to execute a resolve
anyway.
Change-Id: Ic1939c25df20ed65a4c48dc81ee549b2cd8b6ec3
2012-10-18 15:05:02 -07:00
Craig Mautner
2d5618c221
Allow getDisplayContentLocked to return null...
...
... and check for null returns. This prevents DisplayContent objects
from containing null Display references.
Bug: 7368565 fixed.
Change-Id: I830fb4c1349204c366193657a95a92c48ccee66c
2012-10-18 14:16:43 -07:00
Fabrice Di Meglio
fcc3348f61
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
...
- resolve layout params in ViewGroup when layout direction is changed
- layout param resolution is checking the previous layout direction to
check if we need to resolve
Change-Id: I70af2ad2b4ec83c2ec6c93b3ff445852500d1687
2012-10-18 13:24:03 -07:00
Jeff Hamilton
520afbd2dc
am ba2c79a5: am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit 'ba2c79a59fa9640d3f54c81f05f664a47337a05c':
Changes to support updating location providers.
2012-10-18 12:50:34 -07:00
Jeff Hamilton
d76ba62101
am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
Changes to support updating location providers.
2012-10-18 12:47:42 -07:00
Jeff Hamilton
ba2c79a59f
am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
Changes to support updating location providers.
2012-10-18 12:47:31 -07:00
Jeff Hamilton
e09aed49e3
Merge "Changes to support updating location providers." into jb-mr1-dev
2012-10-18 12:45:02 -07:00