Adam Powell
39bbfc22a9
Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
2011-05-17 18:30:08 -07:00
Katie McCormick
b8fec16e1b
am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '32638ccb66d933512f4792d120b5cd93e9a26537':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:47:48 -07:00
Katie McCormick
a46e385cf1
am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:40:38 -07:00
Katie McCormick
cdb8f8f181
am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:38:04 -07:00
Eric Fischer
202d1e91ba
Merge "Import revised translations."
2011-05-17 17:14:56 -07:00
Mike Lockwood
619f940d6c
am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:49:40 -07:00
John Reck
e0b3f81c29
am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1818b4a99016486d42de1a2ff35c88bb3197cd20':
Don't use mobile for large uastring
2011-05-17 16:49:25 -07:00
Mike Lockwood
62f5c48e9c
am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:44:51 -07:00
Mike Lockwood
77656e2961
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
2011-05-17 16:42:48 -07:00
John Reck
4af6883894
am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1147bf638a791ef403c0cc6654f4decd1b0d67c1':
Don't use mobile for large uastring
2011-05-17 16:18:11 -07:00
Alex Sakhartchouk
9de073cc8a
Merge "Moves fbo support in renderscript behind the hal"
2011-05-17 15:40:29 -07:00
Jamie Gennis
62c530f147
Merge "SurfaceFlinger: unfreeze windows for fixed size buffers."
2011-05-17 15:13:35 -07:00
Jaikumar Ganesh
0cff374d7f
Merge "Improve locking granularity for PAN and Input."
2011-05-17 15:12:00 -07:00
Romain Guy
9dbff77e6b
Merge "Improve LayoutInflater's compliance."
2011-05-17 15:06:09 -07:00
Jason Sams
77a992e4eb
Merge "Core to client fifo on sockets."
2011-05-17 15:05:50 -07:00
Brian Carlstrom
dd946194ef
Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (1 of 3)"
2011-05-17 14:57:31 -07:00
Fabrice Di Meglio
66826dbe90
Merge "View horizontalDirection public attribute resolution to an internal var."
2011-05-17 14:16:43 -07:00
Chet Haase
39bede87fc
Merge "Fix for using HARDWARE layers on unaccelerated views."
2011-05-17 14:00:53 -07:00
Adam Powell
170bcc4b25
Merge "resolved conflicts for merge of 2b6ace58 to master"
2011-05-17 13:57:07 -07:00
James Dong
596982fff8
Merge "Make track informational event optional, depending on system property"
2011-05-17 13:41:42 -07:00
Adam Powell
cdce06d931
resolved conflicts for merge of 2b6ace58 to master
...
Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda
2011-05-17 13:41:24 -07:00
Eric Fischer
590ffda086
am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'd9703697b20b666112a27d904db5fbaf391b3dd2':
Import revised translations. DO NOT MERGE
2011-05-17 13:31:48 -07:00
Eric Fischer
00c777748f
am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'da4809455716cf16451ca5db79654370a6a44f17':
Import revised translations. DO NOT MERGE
2011-05-17 13:27:59 -07:00
Eric Fischer
37ce5ab46d
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -07:00
Mike Lockwood
aace777cd5
am 798df16e: am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '798df16e3a3920ba55d7abc7ed10def6a17132bf':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:14:32 -07:00
Mike Lockwood
8973de98b0
am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '50b27631598d56cf2def58270ddcf1619045dda4':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:12:32 -07:00
Jeff Sharkey
d4cbb9db8a
Merge "First pass at NetworkPolicy and activity tracking."
2011-05-17 12:27:01 -07:00
Adam Powell
6cc063af34
am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
Prevent cases of bogus action bar measurement.
2011-05-17 12:21:22 -07:00
Adam Powell
edc63bcdb5
am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
2011-05-17 12:18:05 -07:00
Adam Powell
d1438416be
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
2011-05-17 12:16:29 -07:00
Scott Main
5a7dbe3a25
am 092aac23: am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit '092aac23cef95ca4372a815210ff448b9c919aa4':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:55:13 -07:00
Scott Main
548ae88d82
am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit '8a769dd1e3a328860c541faf56a6e676bf1dc01c':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:50:51 -07:00
Scott Main
8e6b8a7366
am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:22:49 -07:00
Scott Main
dfd85f44da
am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:19:01 -07:00
Brian Carlstrom
7f35863356
Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (1 of 6)"
2011-05-17 10:37:44 -07:00
Andreas Huber
550f667feb
am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:37:25 -07:00
Andreas Huber
fbc17e128a
am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:34:41 -07:00
Andreas Huber
d42e13e38a
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:31:58 -07:00
Andreas Huber
1e9440dc86
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
2011-05-17 10:29:36 -07:00
Andreas Huber
79e058fcd4
Merge "Claim support for .3gpp2 A/B files."
2011-05-17 10:27:09 -07:00
Adam Powell
cecaf04786
am 143c529f: (-s ours) am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit '143c529f28bd49e077e4bc36ff30ed2ff7ffb838':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 10:07:40 -07:00
Adam Powell
6ff4b14385
am b45b21d1: am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit 'b45b21d13e3311c819d5fbd548ff8c859cc1dfe3':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 10:07:23 -07:00
Adam Powell
f3ee19d55c
am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit '21f1d49f0eac47c1ebbabf82f145dc60f988d069':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:55:53 -07:00
Adam Powell
efbd4e9e7a
am b4eb3ace: am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit 'b4eb3acee4504ea35a43bef9dc6220560b55d2d2':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:55:32 -07:00
Adam Powell
e9a7006e63
am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:45:29 -07:00
Adam Powell
cf2cce0ad8
am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit '79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:45:26 -07:00
Adam Powell
0e85987167
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
2011-05-17 09:41:52 -07:00
Adam Powell
dee13897a2
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
2011-05-17 09:41:33 -07:00
Andreas Huber
5cda4179f0
Merge "Disable yuv->yuv mode and external display support until various driver fixes are in."
2011-05-17 08:35:38 -07:00
Derek Sollenberger
3de97a5381
Merge "Updates resulting from the Skia merge (revision 1327)"
2011-05-17 04:55:56 -07:00