Michael Jurka
82f92ee5bd
am 7741b63c: am 6dee0a0f: Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev
...
* commit '7741b63c5a8e14b5123c4b735dc768cf55fa2ed5':
Fix bug where thumbnails flashed more often in Recents
2013-05-08 15:05:18 -07:00
Scott Main
2a31741eec
am 3032ae9b: am 214cb0d4: am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit '3032ae9b4062080bafa854a121e7534069466b7c':
delete obsolete tips/references to cupcake
2013-05-08 15:04:51 -07:00
Fabrice Di Meglio
8be78240f3
am 6eb036e7: am 366b97ba: Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev
...
* commit '6eb036e7894758bcc357fc282070aa8677227ce1':
Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"
2013-05-08 15:04:33 -07:00
Fabrice Di Meglio
0ce3c46034
am 13f693d5: am d7bf6d46: Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev
...
* commit '13f693d5b2f75c76a2fe4351860310b1ded6ea12':
Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView
2013-05-08 15:04:31 -07:00
Fergus Henderson
e4085c9967
am 6c641d3c: am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
...
* commit '6c641d3c67bbd91033254debedff56893d6c53a1':
Fix for TTS.setLanguage throwing MissingResourceException
2013-05-08 15:04:22 -07:00
Baligh Uddin
4652a746a0
am 1b81da5f: (-s ours) am a698a290: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1b81da5f955e60e028a8ce7e61eddc3d9ddff030':
Import translations. DO NOT MERGE
2013-05-08 15:04:20 -07:00
Victoria Lease
e6bca43e93
am b7373537: am acd341d8: Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
...
* commit 'b7373537ecc745306771bae61c03215e56723146':
OO NOT MERGE allow connected location providers location access
2013-05-08 15:04:10 -07:00
Jamie Gennis
8afcf4411e
am 211eae98: am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev
...
* commit '211eae98fce88c7c502eb8f59d956c1a249d77bc':
Add the trace tag for Dalvik.
2013-05-08 15:03:58 -07:00
Alan Viverette
5e6fbf2694
am fa4c935e: am 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.
...
* commit 'fa4c935edcfa09bb53a3aac411a285842a00ddee':
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
2013-05-08 15:03:49 -07:00
Xavier Ducrohet
f4b94a7cb7
am 72cc297c: (-s ours) am 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
...
* commit '72cc297cf26cb37847533b07e8914b97083478a7':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-05-08 15:03:29 -07:00
Jeff Tinker
c8b1f82791
am 5adeaeab: am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
...
* commit '5adeaeabd62481b529ec5999df481d74033d67f9':
Correct java API docs for MediaDrm offline use case
2013-05-08 15:03:23 -07:00
Robert Greenwalt
60307f1ac0
am 27c8b559: am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev
...
* commit '27c8b559b6feaa6ea5c44acc476a714487f1eafa':
Don't back up the scan-always setting.
2013-05-08 15:03:10 -07:00
Craig Mautner
cef2d56fc9
Merge "resolved conflicts for merge of a14a14ab to master"
2013-05-08 22:01:33 +00:00
Craig Mautner
79a64b621e
resolved conflicts for merge of a14a14ab to master
...
Change-Id: I80259a2887f36fc3af409322dea36aa90a2ee847
2013-05-08 15:00:09 -07:00
Craig Mautner
ecda882c13
Merge "Eliminate flash when going from home to recents"
2013-05-08 21:51:23 +00:00
Craig Mautner
c20054a166
Eliminate flash when going from home to recents
...
When the wallpaper animation is coupled to the recents animation it
will go from fully transparent to visible along with it. In master
this is causing noticable jank if we are going from the home screen
where it was previously visible. Detaching the wallpaper animation
from the recents animation fixes it.
Change-Id: If1d1a1478530610017d954983b00ca6101cbaa8b
2013-05-08 14:27:02 -07:00
Michael Jurka
7741b63c5a
am 6dee0a0f: Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev
...
* commit '6dee0a0fe68096a6714b7d570241f61e4d6ea20a':
Fix bug where thumbnails flashed more often in Recents
2013-05-08 14:10:44 -07:00
Michael Jurka
6dee0a0fe6
Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev
2013-05-08 21:07:22 +00:00
Nick Kralevich
dbcf2d7482
PowerManagerService: Don't reboot directly.
...
Instead of calling the reboot system call ourselves, send
a message to init asking it to reboot the system. Init is in
a better position to make sure the system is cleanly shutdown.
Get rid of CAP_SYS_BOOT from system_server.
Bug: 8646621
Change-Id: I200722412844ad8d99e35a442021c6263c3ebc05
2013-05-08 13:42:10 -07:00
Scott Main
3032ae9b40
am 214cb0d4: am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit '214cb0d489a82b6cbe8a7c5ce8efbb77e985c166':
delete obsolete tips/references to cupcake
2013-05-08 13:14:30 -07:00
Scott Main
214cb0d489
am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit 'a086a70ecb6ca47831a6f5a60fb5d11df131d6bf':
delete obsolete tips/references to cupcake
2013-05-08 13:11:13 -07:00
Scott Main
a086a70ecb
am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit '3f4d1bbddba1034af342a95b35a223615ad8bbbd':
delete obsolete tips/references to cupcake
2013-05-08 13:04:26 -07:00
Scott Main
3f4d1bbddb
am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit '52a37bf8ab96c8ef897c4c35e33b4bbe6513de9f':
delete obsolete tips/references to cupcake
2013-05-08 13:01:51 -07:00
Scott Main
52a37bf8ab
am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit '1d21aeca286cb3993ed758fd111a7d945687ed96':
delete obsolete tips/references to cupcake
2013-05-08 12:59:29 -07:00
Scott Main
1d21aeca28
am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
...
* commit '148ce2322c5ce119b2dc6881d60dc60f8c336bfa':
delete obsolete tips/references to cupcake
2013-05-08 12:56:53 -07:00
Scott Main
148ce2322c
Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
2013-05-08 19:50:53 +00:00
Michael Jurka
f42d9010f1
Fix bug where thumbnails flashed more often in Recents
...
Bug: 8867698
Change-Id: I2773601d83507dbb55c3a1d0b723e3853e22d352
2013-05-08 20:48:36 +02:00
Fabrice Di Meglio
6eb036e789
am 366b97ba: Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev
...
* commit '366b97ba25de237c42c815c5e8ca36303ce104df':
Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"
2013-05-08 11:17:25 -07:00
Fabrice Di Meglio
13f693d5b2
am d7bf6d46: Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev
...
* commit 'd7bf6d46bd636991885662da5e710b1cf08a44d8':
Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView
2013-05-08 11:17:23 -07:00
Fabrice Di Meglio
366b97ba25
Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev
2013-05-08 17:56:17 +00:00
Fabrice Di Meglio
d7bf6d46bd
Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev
2013-05-08 17:50:18 +00:00
Fergus Henderson
6c641d3c67
am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
...
* commit '3cf3a0b30cd3d3be806eeb04861731d7ed6e6f23':
Fix for TTS.setLanguage throwing MissingResourceException
2013-05-08 10:47:56 -07:00
Baligh Uddin
1b81da5f95
am a698a290: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'a698a29021934b7bf6e468e2949b05c79b268b05':
Import translations. DO NOT MERGE
2013-05-08 10:47:52 -07:00
Eric Laurent
d71bfdabff
Merge "Fix BT SCO audio test application."
2013-05-08 17:43:17 +00:00
Fergus Henderson
3cf3a0b30c
Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
2013-05-08 17:42:00 +00:00
Baligh Uddin
3421521ccf
Merge "Import translations. DO NOT MERGE"
2013-05-08 17:36:44 +00:00
Baligh Uddin
a698a29021
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-08 17:36:22 +00:00
Baligh Uddin
31f20868e4
Import translations. DO NOT MERGE
...
Change-Id: I37dff8add98d5b8bcfb0e0f81e22958ba7cfaa2b
Auto-generated-cl: translation import
2013-05-08 08:31:18 -07:00
Baligh Uddin
28d7c7e034
Import translations. DO NOT MERGE
...
Change-Id: Id91ccb35503df68ecc0c3f59c1601e0adf74e876
Auto-generated-cl: translation import
2013-05-08 08:21:20 -07:00
Baligh Uddin
1218e847f5
Import translations. DO NOT MERGE
...
Change-Id: Iecabdf3bc156108d88dd0bc76a48c50b608678dc
Auto-generated-cl: translation import
2013-05-08 08:18:13 -07:00
Przemyslaw Szczepaniak
d0b927948e
Fix for TTS.setLanguage throwing MissingResourceException
...
Change I766f106b9165932de17de84bdd422d0fc0ae27f1 made getISO3*
methods throw MissingResourceException if locale was invalid.
This causes regression on last android release, where invalid
locale was silently ignored.
+ fix for .isLanguageAvailable
Bug: 8709594
Change-Id: Ieada6b90dc53cfdf0a4e2b4ca69854b811d0fec2
2013-05-08 15:56:12 +01:00
Victoria Lease
b7373537ec
am acd341d8: Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
...
* commit 'acd341d8682ca57c1066d664725ebc72f5ef10c1':
OO NOT MERGE allow connected location providers location access
2013-05-08 07:41:56 -07:00
Victoria Lease
acd341d868
Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
2013-05-08 14:40:15 +00:00
Dima Zavin
3b9831f6a2
Merge "aapt: move qsort_r_compat here as it is sole client"
2013-05-08 07:35:34 +00:00
Mathias Agopian
60e510af80
desperate attempt to fix linux build.
...
working on the assumption that the ordering in
LOCAL_STATIC_LIBRARIES matters.
Change-Id: Ibf5b706652049b195bd66c84c9a5fa1122454ca6
2013-05-07 19:52:05 -07:00
Jamie Gennis
211eae98fc
am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev
...
* commit 'd28653df6580b76559374580764aa2e86d6c2f48':
Add the trace tag for Dalvik.
2013-05-07 18:23:20 -07:00
Jamie Gennis
d28653df65
Merge "Add the trace tag for Dalvik." into jb-mr2-dev
2013-05-08 01:21:33 +00:00
Alan Viverette
fa4c935edc
am 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.
...
* commit '239a0c0e6a6fc36025fdb1c662e1c7acaec144bb':
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
2013-05-07 17:43:18 -07:00
Alan Viverette
239a0c0e6a
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
...
Internal state must be cleared before calling any methods on the focus
host, since the method may be called again from the host and attempt to
recycle the same AccessibilityNodeInfo twice.
BUG: 8856860
Change-Id: I0410989fd6f3ce3ce29de8edebdfbf3847188843
2013-05-07 17:17:35 -07:00
Mathias Agopian
1f5762e646
libutils clean-up
...
Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
2013-05-07 17:09:46 -07:00