drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,258 Commits 1 Branch 0 Tags
Commit Graph

106258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
9f3e117565 Merge "New UndoManager." 2013-05-07 22:28:59 +00:00
Jamie Gennis
0cc84cefdd Add the trace tag for Dalvik. 
Bug: 8856374
Change-Id: Id0fbdb8f7a487c5831edcd2c6c64a7da63aec03d
 2013-05-07 15:23:06 -07: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
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
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
Daniel Sandler
c1b49bd26b Defend against a system server crash. 
Bug: 8575629
Change-Id: Iafc8ab2f7460c8eacc37fc077cf5a3df16cf2911
 2013-05-07 13:55:07 -04: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
Scott Main
2b6daf130a am 0ba3d91f: am 05759d15: Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev 
* commit '0ba3d91f2da7773492739aad267d6d825d1465fd':
  add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126
 2013-05-07 10:18:42 -07:00
Jesse Hall
ce3fe5fd8a am 4d32a367: am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev 
* commit '4d32a36759b619abdda9c895054f513aef3a3f03':
  Register EGLExt JNI methods
 2013-05-07 10:18:38 -07:00
Scott Main
3c8ecd30b4 am b2606b3f: am c98612a9: some more search tags 
* commit 'b2606b3fe8906fb14db07b5dc099ff0b52db4c29':
  some more search tags
 2013-05-07 10:16:40 -07:00
Scott Main
b2606b3fe8 am c98612a9: some more search tags 
* commit 'c98612a9b2293f8ae29389dd484d7b384c7d37ad':
  some more search tags
 2013-05-07 10:15:11 -07:00
Kenny Root
1d69bad411 resolved conflicts for merge of a98b0ff8 to master 
Change-Id: I1f4a952d360c48426e22a7772726b6867cc19771
 2013-05-07 10:14:46 -07:00
Scott Main
c98612a9b2 some more search tags 
Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1
 2013-05-07 10:13:07 -07:00
Christopher Tate
1d41cae973 am 1bc3e39a: am 06548798: am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore 
* commit '1bc3e39ab48936bf82b8c11688ba0939e0866a44':
  Ensure install-during-restore is like install-then-restore
 2013-05-07 10:01:28 -07:00
Kenny Root
ae062e0a02 am 5f851a89: am cd1de394: Merge "Track change in NativeCrypto" 
* commit '5f851a89b6a90db206d0e2fa63a60229e2bfcda6':
  Track change in NativeCrypto
 2013-05-07 10:01:24 -07:00
Christopher Tate
ec28e4b588 am 5f714213: am e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev 
* commit '5f714213546d667ac241a92e2052b30dabef8355':
  Ensure install-during-restore is like install-then-restore
 2013-05-07 10:01:09 -07:00
Elliott Hughes
977b2531ae am 4cd60897: am 601afaef: Merge "Someone\'s IDE chose the wrong Date." 
* commit '4cd60897c73ddd67d7f267432073363cbf75371e':
  Someone's IDE chose the wrong Date.
 2013-05-07 10:01:04 -07:00
Kenny Root
add582122d resolved conflicts for merge of 485d7a31 to master 
Change-Id: I058e19af8732df44457bdc614ee810a642dc25e4
 2013-05-07 09:51:31 -07:00
Kenny Root
cfba6a07fd Track change in NativeCrypto 
(cherry picked from commit 4b30e3391bda250975b43af43bad58c98fa73f84)

Change-Id: I9eed3895d78c6906f7d29d325075cf1df48fd123
 2013-05-07 00:44:18 -07:00
Romain Guy
c4818d860b am 4c95c537: Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev 
* commit '4c95c5377a75a3d6c5f3ed8b09a56071d51fadb1':
  Optimize list view scrolls Bug #8108706
 2013-05-06 19:09:25 -07:00
Romain Guy
4c95c5377a Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev 2013-05-07 02:05:38 +00:00
Dirk Dougherty
2ff5a47999 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 'a6303d8a211543a8e1f5fd2425024a1c4d0f88ff':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
 2013-05-06 18:51:11 -07:00