106171 Commits

Author SHA1 Message Date
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
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
Eric Laurent
d71bfdabff Merge "Fix BT SCO audio test application." 2013-05-08 17:43:17 +00:00
Baligh Uddin
3421521ccf Merge "Import translations. DO NOT MERGE" 2013-05-08 17:36:44 +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
1218e847f5 Import translations. DO NOT MERGE
Change-Id: Iecabdf3bc156108d88dd0bc76a48c50b608678dc
Auto-generated-cl: translation import
2013-05-08 08:18:13 -07: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
Mathias Agopian
1f5762e646 libutils clean-up
Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
2013-05-07 17:09:46 -07:00
Dima Zavin
823abb6314 aapt: move qsort_r_compat here as it is sole client
This code is only used on the host for MacOS X compatibility.
Apparently, glibc and Apple's libc disagree on the parameter
ordering.

Change-Id: I214edcf2870b6ac88316306ac5af43f1dadf9b2e
Signed-off-by: Dima Zavin <dima@android.com>
2013-05-07 16:19:41 -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
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
Dianne Hackborn
9f3e117565 Merge "New UndoManager." 2013-05-07 22:28:59 +00:00
Craig Mautner
a89e40ce0b Merge "Do not launch home task if activities remain" 2013-05-07 22:06:26 +00:00
Dianne Hackborn
3aa49b6fec New UndoManager.
Basic implementation of an undo manager.  Supports
multi-level undo/redo, building on the top undo state
as edits occur, managing multiple distinct entities in
the undo state (such as embedded objects in a document),
and saving/restoring the full undo state.  Still some
work remaining on correctly dealing with dependencies
between undo states that hold multiple owners.

Also do a simple implementation of undo state in TextView
to see how things actually work.  The implementation here
is very primitive: it needs a lot more work to correctly
identify when to merge undo ops, is not trying to do
anything smart with style spans, etc.

Change-Id: Ie30f4e133351e2f569ffb48c6c44a2b19cadee27
2013-05-07 15:05:09 -07:00
Craig Mautner
525f3d9df6 Do not launch home task if activities remain
When a root activity is finishing and it is supposed to return to
home make sure there are only lower activities waiting to start before
going home.

Fixes bug 8632206.

Various other refactorings for efficiency.

Change-Id: I8bbb9de78d0ea9f45a504cf4bad72c698e9cc3d8
2013-05-07 15:01:46 -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
Romain Guy
b8985b7942 Merge "Fix double-free in AssetAtlas Bug #8833153" 2013-05-07 21:53:39 +00:00
Romain Guy
d5207b2eb9 Fix double-free in AssetAtlas
Bug #8833153

If Atlas::terminate() is called twice without an init() in between
libhwui would double-free Atlas::mImage. This lead to a lot of crashes
with the monkeys as they can easily trigger memory trims.

Change-Id: I96798414e5e71cd498aaca85a790661ebccdaa91
2013-05-07 14:46:36 -07:00
Victoria Lease
b95c001f7d Merge "allow connected location providers location access" 2013-05-07 21:41:09 +00:00
Victoria Lease
2f5b97c518 allow connected location providers location access
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: I0c383eb82ed041e57a7d32321df2d67b462d4e21
2013-05-07 14:22:02 -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
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
2ae118d107 am e0dda90b: am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
* commit 'e0dda90bde531b12dda8ce0909040b070c3b2b84':
  Fixed unreleased wake lock isues and NPE.
2013-05-07 11:47:19 -07: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
Victoria Lease
176498b5ea Merge "enable selection of Linkify-annotated text" 2013-05-07 18:08:09 +00:00
Scott Main
34dcd3bf25 am c5e1ff3a: am 0c99050e: am 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
* commit 'c5e1ff3ae871b711674236014062d9522175333a':
  some more search tags
2013-05-07 10:29:53 -07:00
Romain Guy
fd06074c68 am c4818d86: am 4c95c537: Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev
* commit 'c4818d860b90813bde082c381de933933abc574c':
  Optimize list view scrolls Bug #8108706
2013-05-07 10:25:20 -07:00
Dirk Dougherty
81d45178ec am 2ff5a479: am a6303d8a: am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '2ff5a47999c5a6801e2e0530fbe1bf80ed25e8f1':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
2013-05-07 10:25:15 -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
Scott Main
961d8d0e95 am c1966dc6: am a4d7214d: am 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects
* commit 'c1966dc6a0a350e8d1002217f3f0fde39ef823cd':
  delete a few unused/obsolete files and add redirects
2013-05-07 10:18:49 -07:00