Adam Powell
0289de8120
am dd0a64a9: am 757b3c27: Fix ordering of product-specific strings
...
* commit 'dd0a64a9ba1c8536337d69d4de55d5c8b133c75d':
Fix ordering of product-specific strings
2012-06-03 14:56:38 -07:00
Adam Powell
dd0a64a9ba
am 757b3c27: Fix ordering of product-specific strings
...
* commit '757b3c274ef0df765bcbc351a64367ed39e69369':
Fix ordering of product-specific strings
2012-06-03 14:52:59 -07:00
Adam Powell
757b3c274e
Fix ordering of product-specific strings
...
Change-Id: Ic825e13be639731380897b937d80938762fce5ce
2012-06-03 14:46:43 -07:00
Adam Powell
1a18189c96
am bdc17727: am 9b12b4ed: Fix product-specific string declaration
...
* commit 'bdc177271ac8484d92218221a0166a273e6e6a10':
Fix product-specific string declaration
2012-06-03 14:45:14 -07:00
Adam Powell
bdc177271a
am 9b12b4ed: Fix product-specific string declaration
...
* commit '9b12b4edcea9a66357b0483a81b79630d83dc6d9':
Fix product-specific string declaration
2012-06-03 14:40:30 -07:00
Adam Powell
9b12b4edce
Fix product-specific string declaration
...
Change-Id: Ib753995ed7bf47bb6724309370c9b05d65cfd81b
2012-06-03 14:32:04 -07:00
Adam Powell
a55a94bfb3
am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev
...
* commit '58e29c06610054419339bb0a75c44ab30d6fe89a':
Add MediaRouter API.
2012-06-03 14:19:07 -07:00
Adam Powell
58e29c0661
am 7c86958d: Merge "Add MediaRouter API." into jb-dev
...
* commit '7c86958d73e7216a92bdfd84fce4440e1def7eaa':
Add MediaRouter API.
2012-06-03 14:14:29 -07:00
Adam Powell
7c86958d73
Merge "Add MediaRouter API." into jb-dev
2012-06-03 14:11:43 -07:00
Svetoslav Ganov
e5b0bc2649
am dafffc35: am 778fa81f: Merge "Fixing a crash in the TouchExplorer." into jb-dev
...
* commit 'dafffc35023df8b22a1a7c294f79da89199dc4c2':
Fixing a crash in the TouchExplorer.
2012-06-03 12:45:24 -07:00
Svetoslav Ganov
dafffc3502
am 778fa81f: Merge "Fixing a crash in the TouchExplorer." into jb-dev
...
* commit '778fa81f5da05dcc45260caa70c97971bdccf8bb':
Fixing a crash in the TouchExplorer.
2012-06-03 12:40:53 -07:00
Svetoslav Ganov
778fa81f5d
Merge "Fixing a crash in the TouchExplorer." into jb-dev
2012-06-03 12:38:57 -07:00
Daniel Sandler
479b6a1493
am 419c7c3d: am a764816b: Merge "Hide notifications until the device is provisioned." into jb-dev
...
* commit '419c7c3d0d129c634f7c631d009aff7987727b46':
Hide notifications until the device is provisioned.
2012-06-03 11:53:05 -07:00
Daniel Sandler
419c7c3d0d
am a764816b: Merge "Hide notifications until the device is provisioned." into jb-dev
...
* commit 'a764816b1ae961218bd7c628ab9f0ad384eab8cd':
Hide notifications until the device is provisioned.
2012-06-03 11:48:34 -07:00
Daniel Sandler
a764816b1a
Merge "Hide notifications until the device is provisioned." into jb-dev
2012-06-03 11:46:13 -07:00
Craig Mautner
4d9d59ab45
am 547be2fc: am da652f6e: Merge "Revert change to correct animations." into jb-dev
...
* commit '547be2fc329c5d8e3fca38cbf17ee32d0e788ac9':
Revert change to correct animations.
2012-06-03 01:02:22 -07:00
Craig Mautner
547be2fc32
am da652f6e: Merge "Revert change to correct animations." into jb-dev
...
* commit 'da652f6e51e5b255019ac020d56e262e477c2a46':
Revert change to correct animations.
2012-06-03 00:59:17 -07:00
Craig Mautner
da652f6e51
Merge "Revert change to correct animations." into jb-dev
2012-06-03 00:57:23 -07:00
Svetoslav Ganov
ebac1b79c4
Fixing a crash in the TouchExplorer.
...
1. If the runnable for performing a long press is not
removed when all pointers are up and it is executed
the explorer gets into delegating mode with no pointer
down and the next down crashes the explorer. Added
code to remove the long press runnable in a few places
it was missing and also added a safety in the runnable
to avoid executing it in case there are no active pointers.
bug:6557183
Change-Id: I9dab3de88fd08d8e2b38af18249ac551837c0736
2012-06-02 16:26:59 -07:00
Michael Jurka
cf9234eba1
am 0962d372: am 1f3c11b7: Merge "Add more logging for bug 6499508 (getting warmer!)" into jb-dev
...
* commit '0962d3729bc241f23bb2adbd066b46caa28db12d':
Add more logging for bug 6499508 (getting warmer!)
2012-06-02 15:36:37 -07:00
Michael Jurka
0e0efa5e5d
am 586a119c: am e766e1f5: Merge "Reduce recents memory usage" into jb-dev
...
* commit '586a119c6f30e8a69f910200afacf1ced6ef44b3':
Reduce recents memory usage
2012-06-02 15:36:34 -07:00
Michael Jurka
0962d3729b
am 1f3c11b7: Merge "Add more logging for bug 6499508 (getting warmer!)" into jb-dev
...
* commit '1f3c11b7952d92ebbafa71bf0904b8137edfd440':
Add more logging for bug 6499508 (getting warmer!)
2012-06-02 15:32:50 -07:00
Michael Jurka
586a119c6f
am e766e1f5: Merge "Reduce recents memory usage" into jb-dev
...
* commit 'e766e1f57b00910442b52d7d11ba808a6b212459':
Reduce recents memory usage
2012-06-02 15:32:49 -07:00
Craig Mautner
3aa7fcac1c
Revert change to correct animations.
...
Incorrect animation was introduced with CL 196207 (perhaps in
combination with a later CL). Reverting part of that CL fixes
the incorrect animation and so far has not reintroduced the jank
that was fixed by that CL. If the jank reappears it should be
fixed in a different fashion than in CL 196207.
Fixes bug 6597505.
Change-Id: Ie8012237a8d49810ede51bd8d78ef8c2fd91ddd4
2012-06-02 15:31:33 -07:00
Michael Jurka
1f3c11b795
Merge "Add more logging for bug 6499508 (getting warmer!)" into jb-dev
2012-06-02 15:30:54 -07:00
Michael Jurka
e766e1f57b
Merge "Reduce recents memory usage" into jb-dev
2012-06-02 15:30:26 -07:00
Craig Mautner
a99b4a1d8d
am e184c05b: am d672b241: Merge "Fix power manager issues." into jb-dev
...
* commit 'e184c05b55335b733662f60acc85706f3fb6b419':
Fix power manager issues.
2012-06-02 11:29:12 -07:00
Craig Mautner
e184c05b55
am d672b241: Merge "Fix power manager issues." into jb-dev
...
* commit 'd672b241f6720201e3b8f613363d71e4291b8597':
Fix power manager issues.
2012-06-02 11:26:07 -07:00
Craig Mautner
d672b241f6
Merge "Fix power manager issues." into jb-dev
2012-06-02 11:24:29 -07:00
Jean-Baptiste Queru
4ddf2199f5
am 5daa08df: am 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
...
* commit '5daa08df5e6a70b40aef210ec5b2bcfa897aaef6':
aapt: Remove terminal pointer incrementaion
2012-06-02 10:05:23 -07:00
Jean-Baptiste Queru
5daa08df5e
am 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
...
* commit '3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338':
aapt: Remove terminal pointer incrementaion
2012-06-02 10:00:47 -07:00
Jean-Baptiste Queru
3df4e1a2f1
am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
...
* commit '0748a5698776d1a9693a5449ffc983af26cc533b':
aapt: Remove terminal pointer incrementaion
2012-06-02 09:56:45 -07:00
Jean-Baptiste Queru
0748a56987
Merge "aapt: Remove terminal pointer incrementaion"
2012-06-02 09:21:37 -07:00
Ben Murdoch
db8f3939dd
am 37f4acde: (-s ours) am dba86e2d: Merge "Get a WebViewDatabaseClassic instance lazily. Do not merge." into jb-dev
...
* commit '37f4acde8917ba40fb620915073e1f4823e7b012':
Get a WebViewDatabaseClassic instance lazily. Do not merge.
2012-06-02 08:40:32 -07:00
Jim Miller
988edcd423
am a8c42f1a: am 94a8ae09: Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
...
* commit 'a8c42f1aaa184ed9b30c747ca03b5d7159a3fb20':
Fix 6592932: add means to replace assist icon from given package
2012-06-02 08:40:28 -07:00
Adrian Ludwig
74981738ad
am 6169ee6d: am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev
...
* commit '6169ee6dcedbac870aa4df92e6c4369614331ce6':
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-02 08:40:24 -07:00
Ruei-sung Lin
4a01bce39a
am 0b5f8ac1: am 56f6c7ff: Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
...
* commit '0b5f8ac125d4e16071df8a47083edc8fa7a1f63b':
Fix b/6575950 make shader program to support different precisions.
2012-06-02 08:40:20 -07:00
Svetoslav Ganov
665ef836b5
am 40404f43: am cba5e879: Merge "Calling the correct method when adding accessibility focusables." into jb-dev
...
* commit '40404f435c17dfbbedfdf358c48f0f91df91b84f':
Calling the correct method when adding accessibility focusables.
2012-06-02 08:40:16 -07:00
Adrian Ludwig
747cc36f22
am 0ec61ff5: am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
...
* commit '0ec61ff561010ef9b4512deffbf66598766172de':
Revert "Update long strings to provide users with more information about permissions."
2012-06-02 08:40:12 -07:00
Adrian Ludwig
11e128ce22
am 2c670142: am c16a199e: Merge "Update long strings to provide users with more information about permissions." into jb-dev
...
* commit '2c6701422e2e35d166195d2135462740bc75a255':
Update long strings to provide users with more information about permissions.
2012-06-02 08:40:09 -07:00
Ben Murdoch
37f4acde89
am dba86e2d: Merge "Get a WebViewDatabaseClassic instance lazily. Do not merge." into jb-dev
...
* commit 'dba86e2dc1e89760670817f16da1d1db04ca85f7':
Get a WebViewDatabaseClassic instance lazily. Do not merge.
2012-06-02 08:35:36 -07:00
Jim Miller
a8c42f1aaa
am 94a8ae09: Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
...
* commit '94a8ae09bea03ec2ca5563601e28a196d41bb6b6':
Fix 6592932: add means to replace assist icon from given package
2012-06-02 08:35:33 -07:00
Adrian Ludwig
6169ee6dce
am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev
...
* commit '2aeaf2345ea0b72322ee301cb4412fa737b594bc':
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-02 08:35:30 -07:00
Ruei-sung Lin
0b5f8ac125
am 56f6c7ff: Merge "Fix b/6575950 make shader program to support different precisions." into jb-dev
...
* commit '56f6c7ff0989ec45ca8639899208054b6c21d979':
Fix b/6575950 make shader program to support different precisions.
2012-06-02 08:35:27 -07:00
Svetoslav Ganov
40404f435c
am cba5e879: Merge "Calling the correct method when adding accessibility focusables." into jb-dev
...
* commit 'cba5e879e825fe37bc1eb092c14f3a5c4d7a29d1':
Calling the correct method when adding accessibility focusables.
2012-06-02 08:35:24 -07:00
Adrian Ludwig
0ec61ff561
am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
...
* commit '6d4d35e382b9efb3debce6f0303dacd33e5131bb':
Revert "Update long strings to provide users with more information about permissions."
2012-06-02 08:34:46 -07:00
Adrian Ludwig
2c6701422e
am c16a199e: Merge "Update long strings to provide users with more information about permissions." into jb-dev
...
* commit 'c16a199eacd21cfd1dd71a209379018769803191':
Update long strings to provide users with more information about permissions.
2012-06-02 08:34:42 -07:00
Adrian Ludwig
8100eaa59d
am d966c19c: am 4bc97b54: Fix build.
...
* commit 'd966c19c090d696363daac73c3cb092340f7c8c9':
Fix build.
2012-06-02 08:21:12 -07:00
Chet Haase
479255ee8a
am 5d666b94: am faa3233e: Merge "Skip LayoutTransition animations on objects of size (0,0)" into jb-dev
...
* commit '5d666b9494b38bc02ea0289e1ba9613ca6e67ef6':
Skip LayoutTransition animations on objects of size (0,0)
2012-06-02 08:21:06 -07:00
Adam Powell
275b010326
am cb5ca957: am 1de19907: Merge "Update indeterminate progress bar assets" into jb-dev
...
* commit 'cb5ca957a2bc18ff6024bd006348ab5fb076ac2a':
Update indeterminate progress bar assets
2012-06-02 08:21:02 -07:00