Craig Mautner
c36c8e6f1f
Fix issue #8868003 : Recents thumbnails scale...
...
...+ zoom to wrong place
We need to make sure the overscan insets are never negative.
master version of ag/307569.
Change-Id: I4beed63a9541e228087b588e32996669755fcc51
2013-05-10 13:33:31 -07: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
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
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
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
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
Dirk Dougherty
a6303d8a21
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 '67430e8ec735c83f1f3304da7037e518aef6128a':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
2013-05-06 18:49:14 -07:00
Dirk Dougherty
67430e8ec7
am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
...
* commit '2e52e815b009fcabb407b9bd0363e0eced6c0229':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
2013-05-06 18:47:29 -07:00
Dirk Dougherty
2e52e815b0
am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
...
* commit '6b6fd9d1f0c829b1bd23c776b98f564848731ea2':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
2013-05-06 18:44:53 -07:00
Dirk Dougherty
6b6fd9d1f0
am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
...
* commit '36aa2759998cbfff7e5baff8b422cbeebd95d5db':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
2013-05-06 18:43:20 -07:00
Romain Guy
5549cb590d
Optimize list view scrolls
...
Bug #8108706
Change-Id: I8679b584132e82b7bb3301a38800de4ddfc57be6
2013-05-06 18:42:08 -07:00
Dirk Dougherty
36aa275999
am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
...
* commit 'b582c678c88df2848023b7f27f4bc0ab2249e1e1':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
2013-05-06 18:41:31 -07:00
Dirk Dougherty
b582c678c8
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
...
Change-Id: Ie390d2bbd8abc0d063c1f313797e8c3d21d27490
2013-05-06 18:38:24 -07:00
Scott Main
c1966dc6a0
am a4d7214d: am 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects
...
* commit 'a4d7214dbebfbab151023bea52b5dfe166b058e0':
delete a few unused/obsolete files and add redirects
2013-05-06 17:44:33 -07:00
Scott Main
a4d7214dbe
am 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects
...
* commit '1282925654f82e6df7a1fb0503de36ee951c126d':
delete a few unused/obsolete files and add redirects
2013-05-06 17:33:52 -07:00
Scott Main
1282925654
am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects
...
* commit '13ae720b46ef657ec866fd4e82c5550a02427ee3':
delete a few unused/obsolete files and add redirects
2013-05-06 17:27:26 -07:00
Scott Main
13ae720b46
am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects
...
* commit 'e7ae74f1b890035ad1a8efdb9292f1dcd83aa3e2':
delete a few unused/obsolete files and add redirects
2013-05-06 17:20:59 -07:00
Scott Main
e7ae74f1b8
am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects
...
* commit '5bde4bc5c7ea442a5940658d17a03f1a5010450c':
delete a few unused/obsolete files and add redirects
2013-05-06 17:18:57 -07:00
Scott Main
5bde4bc5c7
am 1cd65b30: delete a few unused/obsolete files and add redirects
...
* commit '1cd65b30904b07ae4226a6e438647ee3b63d7950':
delete a few unused/obsolete files and add redirects
2013-05-06 17:16:26 -07:00
Scott Main
0ba3d91f2d
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 '05759d1531f4e36b51f386fa884454eeda88ecb8':
add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126
2013-05-06 17:06:40 -07:00
Scott Main
05759d1531
Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug: 8746126" into jb-mr2-dev
2013-05-06 23:56:41 +00:00
Scott Main
1cd65b3090
delete a few unused/obsolete files and add redirects
...
Change-Id: Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 16:51:39 -07:00