Andreas Huber
92f51e247d
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
43124d2214
Merge "Updates resulting from the Skia merge (revision 1327)"
2011-05-17 04:55:56 -07:00
Narayan Kamath
b956f37e37
Pass synthesis request params through to the TTS service.
...
Change-Id: I1ffd617d8dfa0814382643e3cf6b3ab7417c742a
2011-05-17 09:47:59 +01:00
Dianne Hackborn
9d31154d0b
am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb
am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc
Add new command line option to change global screen size.
...
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
2011-05-16 20:55:41 -07:00
Christopher Tate
14a2935809
bu - add handling for both 'backup' and 'restore' modes
...
Requires a parallel change in adb to support the new syntax.
Change-Id: Iff30cb247e424b6817af121c018f3c4e40b9f81a
2011-05-16 16:57:32 -07:00
Jim Miller
4383243d00
Merge "Fix the build."
2011-05-16 16:40:13 -07:00
Jim Miller
3e4df313a6
Fix the build.
...
Change-Id: I884580f52ebc817cee736f6d1bafbc59bd6662cd
2011-05-16 16:38:06 -07:00
Wink Saville
a77f4c530b
am 360f5533: am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
...
* commit '360f553311ab697995d24c2a42e45659a5436efa':
No data icon switch seen between LTE to EHRPD Handover
2011-05-16 16:35:10 -07:00
Wink Saville
360f553311
am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
...
* commit '7b0339a8adca1347fe7ac3ac118c903ff32442a8':
No data icon switch seen between LTE to EHRPD Handover
2011-05-16 16:31:56 -07:00
Wink Saville
7b0339a8ad
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
2011-05-16 16:28:59 -07:00
Andreas Huber
126a2cd686
Disable yuv->yuv mode and external display support until various driver fixes are in.
...
Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
2011-05-16 16:14:13 -07:00
Roman Nurik
0b171e4c3f
am 3eb81b63: am 136fa20d: am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '3eb81b6318f94b21a3559df57f25ff2f48fcb244':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:08:32 -07:00
Roman Nurik
3eb81b6318
am 136fa20d: am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '136fa20d08d3a25c49077fde076febf105452edc':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:06:27 -07:00
Roman Nurik
136fa20d08
am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:03:31 -07:00
Roman Nurik
8f3dbe1c37
am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit 'ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:01:27 -07:00
Roman Nurik
ce6253d8fd
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
2011-05-16 15:58:08 -07:00
Kazuhiro Ondo
2121291186
No data icon switch seen between LTE to EHRPD Handover
...
Change-Id: Ifc8e9e8d88b6617d75322f743ae96fd897a45c3b
2011-05-16 15:54:45 -07:00
Wink Saville
cbdfd801ff
am 648831cc: am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
...
* commit '648831cc85f895e95ce65509f5e9e67ed4bf2926':
Fix data attempt while PS is not in-service
2011-05-16 15:53:57 -07:00
Wink Saville
648831cc85
am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
...
* commit '99f04c4943368ea7ea7f9d28fa941a1b387e7477':
Fix data attempt while PS is not in-service
2011-05-16 15:51:02 -07:00
Wink Saville
99f04c4943
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
2011-05-16 15:47:42 -07:00
Chia-chi Yeh
917e916b1c
Merge "Add a new permission for user space VPN applications."
2011-05-16 15:30:45 -07:00
Andreas Huber
d6577a722a
Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
2011-05-16 15:21:26 -07:00
Chia-chi Yeh
9f67adfc2d
Add a new permission for user space VPN applications.
...
Change-Id: I2b87ef34db01209dac45fbceccafd865840830d5
2011-05-16 15:16:58 -07:00
Fabrice Di Meglio
b5dde704cd
Merge "Adding horizontalDirection public attribute for View."
2011-05-16 15:13:10 -07:00
Kazuhiro Ondo
c1a4e7093e
Fix data attempt while PS is not in-service
...
mAutoAttachOnCreation flag was incorrectly initialized which was
causing invalid data attempts while PS is not in-service.
Change-Id: Iaf16b70b1997631309a4918a99ac5f3c3ea74d02
2011-05-16 15:12:01 -07:00
Cibu Johny
7632cb9be5
Adding horizontalDirection public attribute for View.
...
Change-Id: Ic8a03447252e4e155c3ee874b1d8c8ac0bc9f7f5
2011-05-16 15:08:27 -07:00
Justin Ho
56729cb9df
Merge "Cleaning up notification panel drawables"
2011-05-16 14:45:38 -07:00
Irfan Sheriff
8318561e9a
am 33285c69: am 19055424: am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit '33285c69a6bb01d8e3420694e257802f95d1e884':
Fix ISO country code of Slovenia.
2011-05-16 14:12:08 -07:00
Scott Main
25c3cbef60
am 5bb0c89c: am 0593d383: am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '5bb0c89cf86c415a94d72469684234d3f7e067ec':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:10:09 -07:00
Irfan Sheriff
33285c69a6
am 19055424: am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit '190554246b6fda3453f4a7994fb461f841e82a4a':
Fix ISO country code of Slovenia.
2011-05-16 14:09:26 -07:00
Scott Main
5bb0c89cf8
am 0593d383: am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '0593d383f3c50853123fa99fea172b37463990e0':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:06:25 -07:00
Irfan Sheriff
190554246b
am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit 'cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
2011-05-16 14:06:11 -07:00
Scott Main
0593d383f3
am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:03:43 -07:00
Irfan Sheriff
cff1093fd2
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
2011-05-16 14:02:39 -07:00
Scott Main
8a29ffa3b0
am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:01:30 -07:00
Roman Nurik
ecaf3f4f28
Add link to Speech Input article to resource browser, tweak outdated information in the article.
...
Change-Id: I5715f8bf7f2f11e5005cc3e9541846ac06797ac6
2011-05-16 14:00:13 -07:00
Robert Greenwalt
188b9e9ec0
Fix ISO country code of Slovenia.
...
Misread an IBM site and thought it was sl-sl, but really it is sl-si.
fixes public bug 16021
Change-Id: Ibc9fa4d18fd66fc90f361674159a97e2acb1681d
2011-05-16 13:58:37 -07:00
Scott Main
7a701024be
docs: add redirects to key legacy docs
...
bug: 4439292
Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
2011-05-16 13:54:02 -07:00
Dianne Hackborn
dffa4761c8
am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '60e13114eb806d50b7b362d39051c5c775704bf6':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:18:54 -07:00
Dianne Hackborn
60e13114eb
am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00
Dianne Hackborn
e5eb6a9e01
am 63446167: (-s ours) am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit '63446167b9d6d9ed3410320d17e8fe816caf6c42':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:11:27 -07:00
Dianne Hackborn
b0acb1e890
am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit 'f97ed771979162c4a2a75959c57fb793438a3a8b':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 13:11:24 -07:00
Dianne Hackborn
0eac092766
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
2011-05-16 13:10:23 -07:00
Mike Lockwood
e6f3f54e05
resolved conflicts for merge of b107f4de to master
...
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
2011-05-16 16:08:12 -04:00
Dianne Hackborn
68066c2f38
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
...
Not yet working, so turned off.
Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.
Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
2011-05-16 13:08:07 -07:00
Dianne Hackborn
63446167b9
am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:04:49 -07:00