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
Stephen Hines
0e1207e03d
Switch Fountain(Fbo) to use RSSurfaceView instead of RSTextureView.
...
Change-Id: Ifb036e83d76270075de1e7de3b67bb00c645bff2
2013-05-06 18:18:57 -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
Jesse Hall
4d32a36759
am 2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev
...
* commit '2787ba25fdc4141e74e649922cf982d3f6c0168d':
Register EGLExt JNI methods
2013-05-06 16:48:19 -07:00
Dianne Hackborn
a98b0ff812
am d43a71da: Merge "Help for the debugging help for issue #8734824." into jb-mr2-dev
...
* commit 'd43a71dad80dfca65b0758f4333360516f6ad300':
Help for the debugging help for issue #8734824 .
2013-05-06 16:48:16 -07:00
Jesse Hall
2787ba25fd
Merge "Register EGLExt JNI methods" into jb-mr2-dev
2013-05-06 23:47:17 +00:00
Dianne Hackborn
d43a71dad8
Merge "Help for the debugging help for issue #8734824." into jb-mr2-dev
2013-05-06 23:46:57 +00:00
Scott Main
c89312091e
delete obsolete tips/references to cupcake
...
Change-Id: Ib1ddb19c42840aa830acd85a89e78c149e2f66e9
2013-05-06 16:38:42 -07:00
Dianne Hackborn
26ef95f0c1
Merge "Add new app ops for various interesting audio service things."
2013-05-06 23:32:58 +00:00
Baligh Uddin
140b9b68ee
am 966b340e: (-s ours) am 996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '966b340e7d18b78c74a07379bbd08a426e84d8ce':
Import translations. DO NOT MERGE
2013-05-06 16:20:32 -07:00
Robert Greenwalt
5dd3f51a19
am 8c04cd04: am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev
...
* commit '8c04cd041dfc96ef4af662d50aad63d998314d27':
Fix sync problem in NsdManager
2013-05-06 16:20:30 -07:00
Michael Jurka
f3ff4d6d80
am 664f785e: am 72f2a7af: Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev
...
* commit '664f785e2c8697aa31fa69b9a109c09a99a2d50b':
Fix bug where thumbnails in Recents disappear
2013-05-06 16:20:27 -07:00
Dave Burke
8d05a666fd
am 38996cdc: (-s ours) am 236cc476: Temporarily revert field name change (DO NOT MERGE)
...
* commit '38996cdcf11e46ea510795e99b0a21303d579218':
Temporarily revert field name change (DO NOT MERGE)
2013-05-06 16:20:25 -07:00
Dirk Dougherty
589854346f
am db4f24a6: am 96f69cbe: am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit 'db4f24a6c75e38c21f8c436febabfd5eea6065d8':
Doc change: Update landing pages for Google Play Services.
2013-05-06 16:20:22 -07:00
Jesse Hall
f986f0f590
Merge "resolved conflicts for merge of 78df7b5e to master"
2013-05-06 23:19:26 +00:00
Craig Mautner
c87a732e75
Merge "Call ensureActivitiesVisibleLocked from supervisor."
2013-05-06 23:13:12 +00:00
Dianne Hackborn
ba50b97cff
Add new app ops for various interesting audio service things.
...
Media buttons: note when an application tries to take ownership
of the media buttons.
Audio focus: note when an application tries to take audio focus.
Volume levels: note changes to the volume level of the various
streams.
Maybe we should also have some ops for muting streams, soloing
streams, etc?
Change-Id: I79a5d477b0bad4ff61486cdb73ffb1196a674964
2013-05-06 16:12:12 -07:00
Dianne Hackborn
8bd64df2ad
Help for the debugging help for issue #8734824 .
...
Add a new "hang" am command that lets you hang the system
process. Useful for testing.
Change-Id: Ice0fc52b49d80e5189f016108b03f9fd549b58a7
2013-05-06 16:07:26 -07:00
Jesse Hall
9ee0999bcb
resolved conflicts for merge of 78df7b5e to master
...
Change-Id: I27076f5e6f747a006dcac7cd334cacf56dd57bd5
2013-05-06 16:04:53 -07:00
Christopher Tate
1bc3e39ab4
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 '06548798f5b03b552d27e956da094effb70ee570':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:21:04 -07:00
Christopher Tate
06548798f5
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 '2ad68f7d261a1dbc749f6e322b1e84a1288087bd':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:19:41 -07:00
Christopher Tate
2ad68f7d26
am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit '04d6141033c66a1777ba0c66d67a7540e4c3e89c':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:17:36 -07:00
Christopher Tate
04d6141033
am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit 'dfb33b860f0c936d8af6555835da0ef1aea6c870':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:16:03 -07:00
Christopher Tate
dfb33b860f
am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:14:27 -07:00
Kenny Root
5f851a89b6
am cd1de394: Merge "Track change in NativeCrypto"
...
* commit 'cd1de3940d9c389b6e69a7040c67d3abb8458ad2':
Track change in NativeCrypto
2013-05-06 15:13:58 -07:00
Christopher Tate
fcfc99c064
am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit 'f7918b4a1e06350ba4d69fe47327db830cd4e8ba':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:12:07 -07:00
Kenny Root
cd1de3940d
Merge "Track change in NativeCrypto"
2013-05-06 22:02:20 +00:00
Kenny Root
4b30e3391b
Track change in NativeCrypto
...
Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
2013-05-06 15:00:58 -07:00
Christopher Tate
f7918b4a1e
am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit 'd3a57029e80073aa3c7dfe1dbc8945d32968f6ae':
Ensure install-during-restore is like install-then-restore
2013-05-06 15:00:53 -07:00
Raph Levien
dd0a91294b
Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App
...
For fullwidth latin (or, more generally, a font considered as a complex
script, but not supported by the font specified), and for a font other
than a system default font, we were getting a mismatch in baseGlyphCount
between the shaping and painting fonts.
This patch preserves the original typeface in this case. In that sense,
it is a slightly more general fix for bug 8127795.
Change-Id: Ibdbfdb34eb7dc39cc8f0784a67c93c9af4ce6ab2
2013-05-06 15:00:41 -07:00
Christopher Tate
d3a57029e8
am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4':
Ensure install-during-restore is like install-then-restore
2013-05-06 14:59:40 -07:00
Christopher Tate
1b0c9c95dc
am 81c1d8d3: Ensure install-during-restore is like install-then-restore
...
* commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
Ensure install-during-restore is like install-then-restore
2013-05-06 14:53:10 -07:00
Christopher Tate
81c1d8d3a5
Ensure install-during-restore is like install-then-restore
...
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.
Bug 8833099
(cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)
Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
2013-05-06 14:43:05 -07:00
Christopher Tate
5f71421354
am e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev
...
* commit 'e242c731f2288a615d54f329cdeb16157d4c15ea':
Ensure install-during-restore is like install-then-restore
2013-05-06 14:25:10 -07:00
Christopher Tate
e242c731f2
Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev
2013-05-06 21:12:41 +00:00
Elliott Hughes
4cd60897c7
am 601afaef: Merge "Someone\'s IDE chose the wrong Date."
...
* commit '601afaef5220aef928a9235e50376c462538a942':
Someone's IDE chose the wrong Date.
2013-05-06 14:04:34 -07:00