Jeff Brown
1d2b445d74
Merge "Reduce auto-brightness jitter." into jb-mr1-dev
2012-10-18 23:23:57 -07:00
Jeff Sharkey
5831159b8d
Merge "More migration to Global settings." into jb-mr1-dev
2012-10-18 23:23:16 -07:00
Jeff Brown
ce78b02617
Merge "Fix deadlock." into jb-mr1-dev
2012-10-18 23:22:02 -07:00
Dave Burke
0b9b415632
am b1f434c1: 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 'b1f434c16eefb028ef441ba40df8abe1e087a4eb':
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:09:48 -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
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
Eric Laurent
f526e1e048
New camera sounds
...
Added new camera shutter, video start and video stop sounds.
Bug 7377030.
Change-Id: If2215042fe812280122de40fb6de31c1541adb0c
2012-10-18 19:03:20 -07:00
Jeff Brown
4f0e969eab
Reduce auto-brightness jitter.
...
Apply additional hysteresis controls to prevent repeated brightness
changes within a short interval.
Bug: 7266090
Change-Id: I73122457f6f3200c80188d3716ce2baf38f6a0a6
2012-10-18 18:45: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
Xavier Ducrohet
774ac65ae2
am 2533ece0: (-s ours) am 1a755c67: am ed5387be: am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
...
* commit '2533ece0054c9d366bd609bf12d9a5702db8211c':
Layoutlib: Read and close XML files as soon as possible. do not merge.
2012-10-18 17:59:41 -07:00
Xavier Ducrohet
2533ece005
am 1a755c67: am ed5387be: am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
...
* commit '1a755c67e00ddffcb5819ed9caa9096b7203aa3c':
Layoutlib: Read and close XML files as soon as possible. do not merge.
2012-10-18 17:57:37 -07:00
Xavier Ducrohet
1a755c67e0
am ed5387be: am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
...
* commit 'ed5387be7a78d6d54214683fe5bf8bc3039529b9':
Layoutlib: Read and close XML files as soon as possible. do not merge.
2012-10-18 17:54:25 -07:00
Xavier Ducrohet
ed5387be7a
am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
...
* commit 'fcc93e734be9fe4608fb5a6818163104cdec3fb5':
Layoutlib: Read and close XML files as soon as possible. do not merge.
2012-10-18 17:52:21 -07:00
Xavier Ducrohet
fcc93e734b
am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.
...
* commit '135b5ba52431b147d51a81b807784009cd0510dd':
Layoutlib: Read and close XML files as soon as possible. do not merge.
2012-10-18 17:48:57 -07:00
Jeff Brown
6669250034
Fix deadlock.
...
The display manager must never call into the activity manager with
its lock held. Make it clear that the adapters are constructed
while holding the syncroot lock.
Bug: 7377631
Change-Id: I1557313cbb31dcad9b5a46919a88a5a1c1af3e9b
2012-10-18 17:37:39 -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
Justin Koh
8f38f3c8d5
Add appliance mode handling for WiFi Direct invitation dialog.
...
Add appliance mode handling for WiFi Direct invitation dialog. Otherwise, no
way to accept connections.
Change-Id: Ic31b5bb25fed02848cf7c9e6418e21e9ab8b0cdd
2012-10-18 16:36:57 -07:00
Fabrice Di Meglio
c38684af87
am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
...
* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:29:00 -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
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
Xavier Ducrohet
135b5ba524
Layoutlib: Read and close XML files as soon as possible. do not merge.
...
Because passing an InputStream to KXML does not close the
stream after the file has been parsed, the files are staying
locked on windows until the gc and finalizers are run.
This change preload the XML files and close their stream,
and then pass the content in a stream to the parser.
(cherry picked from commit c48b0b940d632b9862ff6aa32665e37fe9e50845)
Change-Id: I1b225454c166026c1aab6290c55ac8279e8862d5
2012-10-18 15:48:10 -07:00
Fabrice Di Meglio
5f9b095d4c
am 2a902caa: am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev
...
* commit '2a902caab23819591570deacc1741677f7b21118':
Fix the build
2012-10-18 15:46:02 -07:00
Fabrice Di Meglio
2a902caab2
am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev
...
* commit '193229a52a732f537e1f062426d1cc8d774bd2c7':
Fix the build
2012-10-18 15:43:02 -07:00
Fabrice Di Meglio
193229a52a
am 0437302f: Merge "Fix the build" into jb-mr1-dev
...
* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
Fix the build
2012-10-18 15:40:24 -07:00
Jeff Sharkey
8d9a1f66d9
More migration to Global settings.
...
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
2012-10-18 15:38:14 -07:00
Fabrice Di Meglio
0437302f16
Merge "Fix the build" into jb-mr1-dev
2012-10-18 15:37:26 -07:00
Xavier Ducrohet
f21eb1e026
am dc8ae9f7: am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
...
* commit 'dc8ae9f758e034d63104a48daf4d8014fe5dc13a':
Layoutlib: Read and close XML files as soon as possible.
2012-10-18 15:34:53 -07:00
Fabrice Di Meglio
3cb8d26bb0
Fix the build
...
- was missing a "make update-api" pass
Change-Id: I004a1650cf7946e0e8bd36d75dab81bbca80443c
2012-10-18 15:34:30 -07:00
Xavier Ducrohet
dc8ae9f758
am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
...
* commit '26d76606aff48680fc61f9decaeddff3a568ca58':
Layoutlib: Read and close XML files as soon as possible.
2012-10-18 15:32:57 -07:00
Fabrice Di Meglio
f9d08423e3
am 6cb9d909: am 8c2bc7cc: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
...
* commit '6cb9d909f06433c5b9130c55dc08ce8d55e7dac8':
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
2012-10-18 15:31:09 -07:00
Xavier Ducrohet
26d76606af
am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
...
* commit 'd8149b03a8676a49f6ca500eecafe79fadf046a7':
Layoutlib: Read and close XML files as soon as possible.
2012-10-18 15:30:24 -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
Xavier Ducrohet
d8149b03a8
Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev
2012-10-18 15:27:39 -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
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
Svetoslav Ganov
3cfa3e8ee8
am 83c57b5c: am d7169b59: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit '83c57b5c52cf3de2222219a7c47cfc4b3a650333':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:08:00 -07:00
Svetoslav Ganov
83c57b5c52
am d7169b59: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit 'd7169b5936721e8e985e6bf7f7e47095b8d6dcfa':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:05:26 -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
Svetoslav Ganov
d7169b5936
am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
...
* commit '80ce3d8746e9bb727ebf37a8963b96be84d82413':
Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
2012-10-18 15:02:25 -07:00
Svetoslav Ganov
80ce3d8746
Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev
2012-10-18 15:00:18 -07:00
Craig Mautner
29b5069291
am 9b56af30: am 84288ac1: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit '9b56af302ebfd8b25ed5896770d781c3b9b72070':
When removing windows remove from resize list.
2012-10-18 14:54:49 -07:00
Craig Mautner
9b56af302e
am 84288ac1: am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit '84288ac10c96e674be6f0d662862d7c8dbd30de4':
When removing windows remove from resize list.
2012-10-18 14:52:16 -07:00
Craig Mautner
84288ac10c
am be2a4a5e: Merge "When removing windows remove from resize list." into jb-mr1-dev
...
* commit 'be2a4a5e629b31071a160d57188219d6a76011fa':
When removing windows remove from resize list.
2012-10-18 14:49:31 -07:00
Maurice Chu
02822d0590
Enhance AIDL to take an explicit id for methods
...
This adds an annotation to methods in AIDL of the form
"void myMethod() = 3;" to explicitly set the onTransact
id for the method. Either all methods must have explicitly
annotated id's or none of them should be explicitly annotated.
There is error checking in the AIDL compiler
for duplicate id's and id's outside of the valid range.
Bug: 7353910
Change-Id: I868045e3f112c9a279c573cea368a621116cbf77
2012-10-18 14:47:13 -07:00
Craig Mautner
be2a4a5e62
Merge "When removing windows remove from resize list." into jb-mr1-dev
2012-10-18 14:46:13 -07:00