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
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
Fergus Henderson
3cf3a0b30c
Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
2013-05-08 17:42:00 +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
28d7c7e034
Import translations. DO NOT MERGE
...
Change-Id: Id91ccb35503df68ecc0c3f59c1601e0adf74e876
Auto-generated-cl: translation import
2013-05-08 08:21:20 -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
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
Xavier Ducrohet
72cc297cf2
am 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
...
* commit '81a8bb1ca9df314faf6de09cc2da0a1db70c7391':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-05-07 16:13:25 -07:00
Xavier Ducrohet
81a8bb1ca9
am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
...
* commit '0974061e941f3aa8c3c5c71ca996be5f93a6a865':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-05-07 16:12:14 -07:00
Xavier Ducrohet
0974061e94
am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
...
* commit '1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-05-07 16:05:58 -07:00
Xavier Ducrohet
1181564fc4
am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
...
* commit '42fb3abd4b7463626983c1a2768788c901f2e71a':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
2013-05-07 16:03:31 -07:00
Fabrice Di Meglio
3167c88c2c
Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"
...
- make SequentialFocusComparator RTL-aware
Change-Id: I3d9cc81f777d16933a8e1b69f8ed63efa5be0925
2013-05-07 15:46:22 -07:00
Jeff Tinker
5adeaeabd6
am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
...
* commit '02f7f449739ae3429b0bf834cebcb2b1bcade8c1':
Correct java API docs for MediaDrm offline use case
2013-05-07 15:38:40 -07:00
Xavier Ducrohet
42fb3abd4b
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
...
Add single crunch command to aapt. do not merge.
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.
The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.
(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)
Change-Id: Ifa0dceed93708658f950322f36c13b6ebe7ab0f3
2013-05-07 15:37:46 -07:00
Jeff Tinker
02f7f44973
Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
2013-05-07 22:36:50 +00:00
Victoria Lease
d9ba79ed7c
OO NOT MERGE allow connected location providers location access
...
Cherry-pick of I0c383eb82ed041e57a7d32321df2d67b462d4e21 from master
Oops, it seems the fused location provider was being denied access
to locations when any user other than the primary device owner is
logged in. This was breaking the fused location provider entirely
for all secondary users of a given device.
Bug: 8766225
Change-Id: Ic0db5f2094828c897a405abb0dca6ac39a2ca526
2013-05-07 15:30:28 -07:00
Jamie Gennis
0cc84cefdd
Add the trace tag for Dalvik.
...
Bug: 8856374
Change-Id: Id0fbdb8f7a487c5831edcd2c6c64a7da63aec03d
2013-05-07 15:23:06 -07:00
Jeff Tinker
ea824eddbc
Correct java API docs for MediaDrm offline use case
...
Documentation only change, no APIs are affected
Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug: 8621588
2013-05-07 15:01:07 -07:00
Robert Greenwalt
27c8b559b6
am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev
...
* commit 'e2322bdd7865552aa31f93bbf4e60d4d9a7d0973':
Don't back up the scan-always setting.
2013-05-07 13:48:49 -07:00
Robert Greenwalt
e2322bdd78
Merge "Don't back up the scan-always setting." into jb-mr2-dev
2013-05-07 20:45:03 +00:00
Fabrice Di Meglio
4662611f37
Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView
...
- use onRtlPropertiesChanged(int) callback for resetting drawables
Change-Id: I53eaa1fe6a211d89e2f2a9581631fb39c7c243c3
2013-05-07 13:30:58 -07:00
Robert Greenwalt
ffff923c74
Don't back up the scan-always setting.
...
We ask the user during device setup to configure this setting -
if we then restore from backup we clobber what they just selected.
Instead, just let them chose during setup and don't back it up.
bug:8825150
Change-Id: I3f2b2291c86a4008bb8ea2468164d9c6c673cbb0
2013-05-07 12:33:15 -07:00
Craig Mautner
a14a14ab85
am 84ce55cf: Merge "Don\'t limit the overscan frame to the window frame." into jb-mr2-dev
...
* commit '84ce55cfd50bdfc7054de5ee9f69de7cf08b61ae':
Don't limit the overscan frame to the window frame.
2013-05-07 12:32:50 -07:00
Craig Mautner
84ce55cfd5
Merge "Don't limit the overscan frame to the window frame." into jb-mr2-dev
2013-05-07 19:24:57 +00:00
Zhentao Sun
e0dda90bde
am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
...
* commit 'aa64548d9f7ee0d3378bc62657e0b86d486038d6':
Fixed unreleased wake lock isues and NPE.
2013-05-07 11:44:46 -07:00
Zhentao Sun
aa64548d9f
Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
2013-05-07 18:43:24 +00:00
Craig Mautner
a248eeec27
Don't limit the overscan frame to the window frame.
...
Fixes bug 8829372.
Change-Id: I803ae60fcc38649c0a7a9cb39429333755e47e2b
2013-05-07 11:41:27 -07:00
Scott Main
c5e1ff3ae8
am 0c99050e: am 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
...
* commit '0c99050eb3114d9ebe6e44e353de1ed6a8822558':
some more search tags
2013-05-07 10:25:11 -07:00
Scott Main
0c99050eb3
am 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
...
* commit '9207be9078a59ecd93073e6892c5c75b47b342d6':
some more search tags
2013-05-07 10:23:17 -07:00
Scott Main
9207be9078
am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
...
* commit 'b80b4bfdae8d9eb7e8ad6c7a44f92d9fd2b9e6d9':
some more search tags
2013-05-07 10:20:58 -07:00
Scott Main
b80b4bfdae
am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
...
* commit '3c8ecd30b41511b84c13c341e2b471a81e19e875':
some more search tags
2013-05-07 10:19:04 -07:00