Irfan Sheriff
3755de281e
am f5d46fd0: am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev
...
* commit 'f5d46fd0ca626ab82c06a082aeb799193927eec6':
2012-10-26 15:19:36 -07:00
Yu Shan Emily Lau
84bad8be27
am ee974a46: am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev
...
* commit 'ee974a469ba297c2fbfd7c8395c0e94b94f844e7':
2012-10-26 15:19:30 -07:00
Fabrice Di Meglio
1eb0b69a0a
am 52d84585: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev
...
* commit '52d84585620f29e57157f0a62c998ca229a43e13':
2012-10-26 15:19:23 -07:00
Fabrice Di Meglio
917cc6a699
am 19f5b3e2: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev
...
* commit '19f5b3e2ab3e0beb4c9c5576b056b2de908f75ac':
2012-10-26 15:19:18 -07:00
Daniel Sandler
4c259e326a
am cdd2e3d6: am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev
...
* commit 'cdd2e3d673af3cb5c70f1bb06dcba1d0bbb0832e':
2012-10-26 15:19:13 -07:00
Daniel Sandler
64f19e468e
am 9d1177d4: am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev
...
* commit '9d1177d4aad1c83245562bdc61f7407be5b741d6':
2012-10-26 15:19:09 -07:00
Daniel Sandler
1b2ee26701
am badf7651: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev
...
* commit 'badf7651c124adfbaeaba452cbd576042bea19f8':
2012-10-26 15:19:05 -07:00
Justin Ho
29681b7b52
am abaf7731: am 144d4055: Merge "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 'abaf7731f91eed99120cbacebbc63c44660fe8d8':
2012-10-26 15:19:01 -07:00
Dianne Hackborn
8fa2b4b487
am ab61e562: am dec9e164: Merge "Fix issue #7343719 : GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev
...
* commit 'ab61e562c8f95f5eb474a1c9c53009c543fb669b':
2012-10-26 15:18:57 -07:00
Bart Sears
63a828f113
am 0cb8a638: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
...
* commit '0cb8a638b7080f2d9f721241bb15bb63c2830e77':
2012-10-26 15:18:53 -07:00
Chet Haase
b97f93296e
am b6b52483: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev
...
* commit 'b6b52483a252a272be7ea8bf752a40b169cbc1ed':
2012-10-26 15:18:49 -07:00
Daniel Sandler
f2ef0f9f3b
am 595703cd: am 91ffeddb: Hide settings button from tablet notification panel.
...
* commit '595703cd3962898b1925ae34bcf41a70092ce0a6':
2012-10-26 15:18:45 -07:00
Amith Yamasani
6b76374f56
am 3727bef8: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev
...
* commit '3727bef8698965c0b1502b61db91e41bae317fa3':
2012-10-26 15:18:41 -07:00
Romain Guy
348cdc4793
am f094d963: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev
...
* commit 'f094d9639497e88ab9e544ed61e3d42b14eb7fc2':
2012-10-26 15:18:37 -07:00
Daniel Sandler
41d4fde196
am 783bd686: am b6454adb: Merge "Quickening." into jb-mr1-dev
...
* commit '783bd686d5ae7baf75a6505c2cf8dfb38d093103':
2012-10-26 15:18:31 -07:00
Baligh Uddin
83fc0be8e7
am 1b9a1418: am c3984879: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '1b9a1418ad7cee07f80ef8eef330ad6c479e34a6':
2012-10-26 15:18:27 -07:00
Baligh Uddin
a625e8a344
am 19b304e7: am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '19b304e79a05227b6d607dead013c3856e739678':
2012-10-26 15:18:17 -07:00
Glenn Kasten
91ab050da8
Merge "Audio assets at 48000 Hz"
2012-10-26 08:16:09 -07:00
Tadashi G. Takaoka
cb95cd6bae
Fix downTime of InputMethodService.sendDownUpKeyEvents method
...
Bug: 7403935
Change-Id: I9074269c9a5f5b54b632da11151ad46c3494dc19
2012-10-26 17:20:59 +09:00
Robert Ly
0d6b2ec5d7
am 2cb1ac9b: am f35690d8: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit '2cb1ac9b96cdb2c9c0b3590df42ce0c6454a847a':
docs: animations au class
2012-10-25 16:40:01 -07:00
Robert Ly
2cb1ac9b96
am f35690d8: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit 'f35690d818f7b915f96cc7e8caba367713342f95':
docs: animations au class
2012-10-25 16:36:54 -07:00
Robert Ly
f35690d818
am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit '148d413164ce0a780236ffb8ada15cad81be6ce7':
docs: animations au class
2012-10-25 16:34:14 -07:00
Robert Ly
148d413164
am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit '5b45e33770f072e281ddf8cda2ecc039a6caedfc':
docs: animations au class
2012-10-25 16:32:18 -07:00
Robert Ly
5b45e33770
am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit 'd6bbf71dc552d54ffde25e8c00ed96630a5221a6':
docs: animations au class
2012-10-25 16:29:09 -07:00
Robert Ly
d6bbf71dc5
am ea502b27: Merge "docs: animations au class" into jb-dev-docs
...
* commit 'ea502b27020872003f1d2be1fb2644b04cc59a67':
docs: animations au class
2012-10-25 16:26:57 -07:00
Robert Ly
ea502b2702
Merge "docs: animations au class" into jb-dev-docs
2012-10-25 16:24:03 -07:00
Jeff Brown
74bea0665a
Disable HDMI rotation lock.
...
We used to lock the rotation to landscape when HDMI
was plugged in because we did not have a mechanism
for independently rotating secondary displays.
Now as part of the multi-display work we do have
a way to do this so we can turn off the special HDMI
rotation lock.
Bug: 7410631
Change-Id: I7948e92ebe6312a1e2eeeb91250259cd67a00fe0
2012-10-25 16:22:22 -07:00
John Spurlock
a247332d47
am 809eeb94: am 22458a49: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
...
* commit '809eeb94b0c9b7d0b6fd6bac091c7ca0a826e224':
Revert part of fix for b/7377776 to fix b/7411356.
2012-10-25 14:23:14 -07:00
John Spurlock
809eeb94b0
am 22458a49: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
...
* commit '22458a49128b2fea4ec2065dc056b194253cb5f0':
Revert part of fix for b/7377776 to fix b/7411356.
2012-10-25 14:20:18 -07:00
John Spurlock
22458a4912
am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
...
* commit '5c87f5334a7414f32e32bcfb0d6c56b07048d058':
Revert part of fix for b/7377776 to fix b/7411356.
2012-10-25 14:18:00 -07:00
John Spurlock
5c87f5334a
Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev
2012-10-25 14:14:52 -07:00
Robert Ly
3f53212602
docs: animations au class
...
Change-Id: I776ccdf44014fe38dd55dedfed8730306d2a2cea
2012-10-25 13:26:32 -07:00
John Spurlock
3e98b9afe6
Revert part of fix for b/7377776 to fix b/7411356.
...
This means the visual glitch is possible again, but reduced since
the layout transitions are disabled.
It's more important to bring back nav buttons for incoming calls
(for the secure, screen off case).
Bug: 7411356
Change-Id: I83005a77930ec7f70a613b3396f85ab1a5fdd96c
2012-10-25 16:15:30 -04:00
Chet Haase
0a35a9e4a1
am 37487666: am b36dca1b: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
...
* commit '374876666cde37f52444f5f038bd4f5f04c47061':
Set wallpaper bitmap reference to null before reloading
2012-10-25 12:28:55 -07:00
Chet Haase
374876666c
am b36dca1b: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
...
* commit 'b36dca1b045698edf7e6804fd4f8cdb1485e096b':
Set wallpaper bitmap reference to null before reloading
2012-10-25 12:25:52 -07:00
Chet Haase
b36dca1b04
am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
...
* commit '9023cf91018c75a179d04256fd4e306065528117':
Set wallpaper bitmap reference to null before reloading
2012-10-25 12:23:14 -07:00
Chet Haase
9023cf9101
Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
2012-10-25 12:19:34 -07:00
Chet Haase
589a6af173
Set wallpaper bitmap reference to null before reloading
...
Give the GC a chance to collect the current bitmap if it needs to,
as it allocates memory for the next one. This helps avoid OOM situations
that can sometimes occur in extreme circumstances (huge bitmaps)
Also set the default_wallpaper to the right default size.
Issue #7352961 Wallpaper edge is cut-off while scrolling through home page
Change-Id: If76b55061d04b29af7f66a6162e307b8b53bf4ae
2012-10-25 11:57:09 -07:00
Fabrice Di Meglio
809312791c
am 0182dc39: am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '0182dc39bd969b797614c90e44978b83ac57fd1c':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:50:07 -07:00
Fabrice Di Meglio
0182dc39bd
am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '3b53061e6d2753440da04c042d26b8c4e94a5b95':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:47:08 -07:00
Fabrice Di Meglio
3b53061e6d
am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
...
* commit '3e297339f8b77d54f520d5471c90c9d04e78400e':
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
2012-10-25 11:44:47 -07:00
Fabrice Di Meglio
3e297339f8
Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
2012-10-25 11:41:20 -07:00
Fabrice Di Meglio
72898e9828
FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
...
- made them private and final
- fixed comment
Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
2012-10-25 11:22:39 -07:00
Svetoslav Ganov
21ab20916e
am 1abaa2cb: am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit '1abaa2cb693743df9a24da265c9c6bd58991ff2c':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:18:10 -07:00
Svetoslav Ganov
1abaa2cb69
am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit 'b8ee636a864577c08a53bf4b1ba8120d952eb5d8':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:15:12 -07:00
Svetoslav Ganov
b8ee636a86
am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
...
* commit '324cfc54ed3527b98069f87665504a423bab63e4':
Accessibility layer in inconsistent state after running UI test automation tests.
2012-10-25 11:13:14 -07:00
Svetoslav Ganov
324cfc54ed
Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
2012-10-25 11:09:30 -07:00
Svetoslav Ganov
7fd9882ba3
Accessibility layer in inconsistent state after running UI test automation tests.
...
1. The accessibility layer has a back door for a UI test automation code running
from the shell to attach. The unregister code does an incorrect identity check
and as a result the register UI test automation service is not disconnected
until its process is killed. The fix is super safe and simple.
bug:7409261
Change-Id: I4b1da18be6c5619dadd4a58fca6724529bc59dea
2012-10-25 09:41:11 -07:00
Bryan Mawhinney
84ab7fee4a
am 1cd75be6: am 83d960bf: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
...
* commit '1cd75be6a7d333ac67366f26d95eed84bb1ae25a':
Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
2012-10-25 02:14:24 -07:00
Bryan Mawhinney
1cd75be6a7
am 83d960bf: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
...
* commit '83d960bffaceb133a3e60dedd69a7690598e40e6':
Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
2012-10-25 02:11:48 -07:00