Commit Graph

31283 Commits

Author SHA1 Message Date
James Dong
b53b7358c3 Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1 2011-03-04 11:37:07 -08:00
Gilles Debunne
f3443a518e Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1 2011-03-04 11:36:17 -08:00
Scott Main
b41feb7850 am 42424da2: am 22724f38: docs: fix toc link in publishing doc
* commit '42424da28b7e2c61d48b13f0daaf2f5b94788c93':
  docs: fix toc link in publishing doc
2011-03-04 11:23:07 -08:00
Scott Main
987701600d am 4f996852: am a2f21847: docs: update market publishing doc
* commit '4f996852e14eea9a7f88715c56484225f52b5d45':
  docs: update market publishing doc
2011-03-04 11:23:00 -08:00
Scott Main
856c57e6d2 am 22724f38: docs: fix toc link in publishing doc
* commit '22724f3873b50747ca0fb41bbc5fe9b1acacadf2':
  docs: fix toc link in publishing doc
2011-03-04 11:17:53 -08:00
Scott Main
b1d645bfe1 am a2f21847: docs: update market publishing doc
* commit 'a2f21847d97042677efdd3b4f001bdbdc8dd1a43':
  docs: update market publishing doc
2011-03-04 11:17:28 -08:00
Chet Haase
5e73f7ca71 am b0be85f5: Merge "Fix problem with transparent background on Twitter app" into honeycomb-mr1
* commit 'b0be85f50d55b03a34bec5bbb326daa79d5907fe':
  Fix problem with transparent background on Twitter app
2011-03-04 10:39:15 -08:00
Chet Haase
37737260cf Merge "Fix problem with transparent background on Twitter app" into honeycomb-mr1 2011-03-04 10:35:40 -08:00
Scott Main
568ba3674f am b1912259: am c44f3907: docs: add redirects for preview docs
* commit 'b191225940ba2f1f56100e62ba2a4f6a49e820ea':
  docs: add redirects for preview docs
2011-03-04 09:45:56 -08:00
Scott Main
ad14461752 am c44f3907: docs: add redirects for preview docs
* commit 'c44f3907c4a45a1b3724535bf4aa6de7f31224ee':
  docs: add redirects for preview docs
2011-03-04 09:42:52 -08:00
Leon Scroggins
e669e07e64 am 91ac3dc0: Merge "Use the same width as the TextView created layout." into honeycomb-mr1
* commit '91ac3dc06d1b99c5e63cda3b5ae0adfec406fd7a':
  Use the same width as the TextView created layout.
2011-03-04 09:35:25 -08:00
Leon Scroggins
e0c415762a Merge "Use the same width as the TextView created layout." into honeycomb-mr1 2011-03-04 09:32:14 -08:00
Ken Wakasa
0a7760f765 am 6e38d26c: Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1
* commit '6e38d26c1e66cc957c33d4263013e02623ebd6da':
  Fix the sort order of the input methods & subtypes in the settings.
2011-03-04 02:59:48 -08:00
Ken Wakasa
82da7c2e21 Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1 2011-03-04 02:57:20 -08:00
Dianne Hackborn
8af636c4bc am 54b3cb17: am f8b8a3fa: Refector preferred activity code out of package manager.
* commit '54b3cb170cc8c80b196079131c3a04410cfff035':
  Refector preferred activity code out of package manager.
2011-03-04 01:10:58 -08:00
Dianne Hackborn
6f0f4e17ac am a6d2c62b: am 48f91e35: Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
* commit 'a6d2c62b58075e338bb08f419ca1567d87d82dd2':
  Fix Fragment.onInflate() to actually work correctly.
2011-03-04 01:01:47 -08:00
Svetoslav Ganov
2beff622fd am 5f96962c: am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1
* commit '5f96962caa23eec25d449e47a2f677d1ff8e53c9':
  Propagating core settings to the system process.
2011-03-04 01:01:44 -08:00
Rebecca Schultz Zavin
b9278b168c am 0b20a705: am 327e94da: Merge "set max_events_per_sec to 55" into honeycomb-mr1
* commit '0b20a705babac184754e41919ddbc3b9a3937933':
  set max_events_per_sec to 55
2011-03-04 01:01:39 -08:00
Rebecca Schultz Zavin
2a70b75d3a am bfc385b8: am 72b3524e: Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1
* commit 'bfc385b8c8af76dd42dd851b818574fb1e9347ee':
  Set last event time to previous event batch delivery time to apps
2011-03-04 01:01:35 -08:00
satok
bb721cd518 am 60047431: am 73016396: Merge "Add a test for persist properties settings" into honeycomb-mr1
* commit '6004743184b8b4425f7af46481612b300d72673a':
  Add a test for persist properties settings
2011-03-04 01:01:31 -08:00
Christopher Tate
26a5decfc6 am 0474407e: am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
* commit '0474407e5d99d6e78451c66703d2934adca0cec4':
  Don't spuriously time out restore sessions
2011-03-04 01:01:26 -08:00
Michael Kolb
9b6d286b25 am d8b243fe: am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1
* commit 'd8b243fea28abda8b0a35b4698a7fe72c39fcace':
  fix NPE in getSearchBox
2011-03-04 01:01:21 -08:00
Ken Wakasa
ad157ddfd2 am 1b3f178f: am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
* commit '1b3f178f85284c8b87a57596b50366522dea4766':
  Append IME's name to the subtype name in the "Select input method" dialog
2011-03-04 01:01:16 -08:00
Stephen Hines
c7567047b5 am 47ffa461: (-s ours) am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
* commit '47ffa461676cae538fbe10da52f309f6cd24fed9':
  DO NOT MERGE: Almost all warnings are now errors in RS build.
2011-03-04 01:01:10 -08:00
Wink Saville
88c3386cfa am 5cf1dbec: (-s ours) am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1
* commit '5cf1dbec1b1d534863f03fc166c7289c4a9d399c':
  DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-04 01:01:04 -08:00
Stephen Hines
83f3694503 am e5841d75: (-s ours) am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1
* commit 'e5841d7538583420d3bad1c77ad428243f7b7054':
  DO NOT MERGE: Fix typos in RenderScript docs.
2011-03-04 01:00:59 -08:00
Eric Fischer
b8f4cfe2c0 am f4c0a050: am 6c935e63: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1
* commit 'f4c0a050c7f474529269f94418a4c4d2960c6752':
  Remove unneeded large-screen-specific translations.
2011-03-04 01:00:52 -08:00
Shimeng (Simon) Wang
e7ee30c020 am cb7f5187: am 6cc2bbe5: Merge "Shorten the animation length to make it snappier." into honeycomb-mr1
* commit 'cb7f5187d37d70786c03d5531b36f7fc3bf7c129':
  Shorten the animation length to make it snappier.
2011-03-04 01:00:46 -08:00
Adam Powell
c3b52b7270 am 89b1c371: am 580cde18: Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1
* commit '89b1c37127f1c60f80e52887cccd0bf72edf5e0c':
  Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes
2011-03-04 01:00:39 -08:00
Adam Powell
4cf29c13da am 1a510ea1: am 789ff0a1: Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1
* commit '1a510ea1fdbf23931ea6fa7d97c5b435454c574d':
  Fix bug 3505901 - SeekBar should account for thumb width in layout
2011-03-04 01:00:32 -08:00
Irfan Sheriff
6aa262a93d am f5949e0e: (-s ours) am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1
* commit 'f5949e0ed1cd15c9535a07181fe58dc3f240767e':
  DO NOT MERGE update current config with dhcp settings
2011-03-04 01:00:21 -08:00
Dianne Hackborn
661f883880 am f8b8a3fa: Refector preferred activity code out of package manager.
* commit 'f8b8a3fa955b545843ca264428c620b67c2a5359':
  Refector preferred activity code out of package manager.
2011-03-04 00:22:40 -08:00
Dianne Hackborn
17bd93939a am 48f91e35: Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
* commit '48f91e35c5188f3dc78c12b8e8638a248221691b':
  Fix Fragment.onInflate() to actually work correctly.
2011-03-04 00:16:57 -08:00
Svetoslav Ganov
3c154c56df am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1
* commit '1e158e9ce78c25dc5de402f14654a8955de7fddc':
  Propagating core settings to the system process.
2011-03-04 00:16:53 -08:00
Rebecca Schultz Zavin
0da6dab937 am 327e94da: Merge "set max_events_per_sec to 55" into honeycomb-mr1
* commit '327e94daff12ab4ac4da61a3ea802f3f225d1b3a':
  set max_events_per_sec to 55
2011-03-04 00:16:49 -08:00
Rebecca Schultz Zavin
a1e348793d am 72b3524e: Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1
* commit '72b3524eef79abc6680aae713b270cbf3d88be6c':
  Set last event time to previous event batch delivery time to apps
2011-03-04 00:16:45 -08:00
satok
781e9d4afc am 73016396: Merge "Add a test for persist properties settings" into honeycomb-mr1
* commit '73016396993efaa7b4bc23b5e8bf198deb230a2a':
  Add a test for persist properties settings
2011-03-04 00:16:32 -08:00
Christopher Tate
e26442d949 am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
* commit '87ed42d065653aa30b2d1b8b220b75375cf9af30':
  Don't spuriously time out restore sessions
2011-03-04 00:16:27 -08:00
Michael Kolb
ffd51f5638 am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1
* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
  fix NPE in getSearchBox
2011-03-04 00:16:22 -08:00
Ken Wakasa
ae19cefe3e am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
* commit 'a7001ee8b60d66c25de69c8496108c40a0f2df88':
  Append IME's name to the subtype name in the "Select input method" dialog
2011-03-04 00:16:16 -08:00
Stephen Hines
96b197ace2 am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
* commit '6e71c954faff34b78a2952436b4f48d84a8c20cd':
  DO NOT MERGE: Almost all warnings are now errors in RS build.
2011-03-04 00:16:11 -08:00
Wink Saville
41b12cc6e5 am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1
* commit '389bf4f734f1820e31f8807d117b6b15ded9ff8b':
  DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-04 00:16:05 -08:00
Stephen Hines
e23573e745 am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1
* commit '3080b85c2ef8846099ae86cd8fea65592a6a591d':
  DO NOT MERGE: Fix typos in RenderScript docs.
2011-03-04 00:15:59 -08:00
Eric Fischer
bc3d746f9e am 6c935e63: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1
* commit '6c935e634844055b3e6a4deed64d6e3dc816d1c5':
  Remove unneeded large-screen-specific translations.
2011-03-04 00:15:54 -08:00
Shimeng (Simon) Wang
7074b1b624 am 6cc2bbe5: Merge "Shorten the animation length to make it snappier." into honeycomb-mr1
* commit '6cc2bbe5cf8c959239d35972c0acac494e5c1559':
  Shorten the animation length to make it snappier.
2011-03-04 00:15:48 -08:00
Adam Powell
ba5f27fab4 am 580cde18: Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1
* commit '580cde18619be70d3fe296c83360bf52772af636':
  Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes
2011-03-04 00:15:41 -08:00
Adam Powell
8562ecd84f am 789ff0a1: Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1
* commit '789ff0a13b9bbb69ead32d0084ec9e058061f419':
  Fix bug 3505901 - SeekBar should account for thumb width in layout
2011-03-04 00:15:35 -08:00
Irfan Sheriff
a9e7cd1efe am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1
* commit '9c8de7331475ef6f55449d95d0dfc6dcb425d116':
  DO NOT MERGE update current config with dhcp settings
2011-03-04 00:15:28 -08:00
Ed Heyl
ad08ce8804 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-03-03 22:26:06 -08:00
Dianne Hackborn
eb612b3e62 Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1 2011-03-03 22:23:07 -08:00