Costin Manolache
d72f440703
am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 09:24:20 -07:00
Jean-Michel Trivi
4a7f040367
am 4f9c9aa8: am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-12 09:24:12 -07:00
android-build SharedAccount
61b1681025
resolved conflicts with ae4043ce1db1e2b30c23ec3d5b22fd382b92d961 merge
...
Change-Id: I6618d37c717f592c9f016367395c2bce36215638
2010-05-12 09:21:52 -07:00
Jean-Michel Trivi
08c4903562
am 11e26c28: am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play not
2010-05-12 09:14:19 -07:00
Wu-cheng Li
922e4902f4
am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
2010-05-12 09:14:11 -07:00
Costin Manolache
d1897c74d7
am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 08:48:20 -07:00
Jean-Michel Trivi
ed51742618
am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-12 08:48:07 -07:00
Dirk Dougherty
7bd44d6bde
am 17246c6d: am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
2010-05-12 08:47:59 -07:00
Jean-Michel Trivi
ee791dc075
am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications ca
2010-05-12 08:47:51 -07:00
Wu-cheng Li
1217a40632
am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
2010-05-12 08:47:42 -07:00
Costin Manolache
7d3262c5ba
am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken
* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
Bug 2673557: rename datamessaging
2010-05-12 07:55:32 -07:00
Jean-Michel Trivi
9496e90287
am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
...
Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken
* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
Update javadoc in android.media.AudioManager to not hide the
2010-05-12 07:55:25 -07:00
Dirk Dougherty
c36408479d
am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
...
Merge commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3' into kraken
* commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
2010-05-12 07:55:17 -07:00
Jean-Michel Trivi
8e6e343099
am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the comp
...
Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken
* commit 'ea37d9b489aac1a4a8de71887581fe712e26e144':
Fix bug 2670395 and 2599698
2010-05-12 07:55:09 -07:00
Wu-cheng Li
9f379c7d27
am d8c33747: am 78624e41: Add remove method in CameraParameters class.
...
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken
* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
Add remove method in CameraParameters class.
2010-05-12 07:55:00 -07:00
Costin Manolache
884e624b3a
am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp
* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
Bug 2673557: rename datamessaging
2010-05-12 07:49:16 -07:00
Jean-Michel Trivi
e2eceb0ef4
am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
...
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp
* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
2010-05-12 07:49:10 -07:00
Dirk Dougherty
e0aa23a970
am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
...
Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp
* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
2010-05-12 07:49:00 -07:00
Jean-Michel Trivi
98dd1ec92c
am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen
...
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp
* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
Fix bug 2670395 and 2599698
2010-05-12 07:48:50 -07:00
Wu-cheng Li
d76bfb35de
am 78624e41: Add remove method in CameraParameters class.
...
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp
* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
Add remove method in CameraParameters class.
2010-05-12 07:48:41 -07:00
Jeff Hamilton
9ac1c32188
Merge "Add Activity.isChangingConfiguration()."
2010-05-11 21:45:19 -07:00
Jason Sams
967910f52a
Merge "Convert renderscript from using ACC to LLVM for its compiler."
2010-05-11 14:04:42 -07:00
James Dong
10f2a40362
am 144bb4fa: am 2cd841d4: Added initial validation on video/audio encoding parameters before/at start()
2010-05-11 13:39:52 -07:00
Jamie Gennis
1249c11990
am c34a4fe3: am 25c2af99: Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken
2010-05-11 13:39:45 -07:00
James Dong
8783fe2902
am 6d111efe: am b5e74239: Output streamable MP4 file during MP4 file recording
2010-05-11 13:39:39 -07:00
James Dong
b5b9a4caeb
am 2cd841d4: Added initial validation on video/audio encoding parameters before/at start()
2010-05-11 13:37:11 -07:00
Jamie Gennis
16c54dc00f
am 25c2af99: Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken
2010-05-11 13:37:04 -07:00
James Dong
1924a01aa5
am b5e74239: Output streamable MP4 file during MP4 file recording
2010-05-11 13:36:54 -07:00
Jamie Gennis
1853b7d790
Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken
2010-05-11 12:25:31 -07:00
Costin Manolache
8e254d83ec
Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
edd2838a25
Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
2010-05-11 11:40:21 -07:00
Dirk Dougherty
6f29001ba5
Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
2010-05-11 11:33:13 -07:00
Keith Ito
f4bbe455a8
am a52c85da: am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-11 10:44:16 -07:00
Nicolas Roard
8cad9c8b7f
Merge "resolved conflicts for merge of bfd6805a to master"
2010-05-11 10:42:41 -07:00
Nicolas Roard
c7d2e82e7f
resolved conflicts for merge of bfd6805a to master
...
Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45
2010-05-11 10:40:11 -07:00
Joe Malin
c75bb89b37
Merge "Doc Change: Testing Procedures documents testing_eclipse.html, testing_otheride.html, guide_toc.cs Change-Id: I25cc9f10f4b677ae4ac87e8f23524c395c17955e"
2010-05-11 10:39:57 -07:00
Dianne Hackborn
78c5bc68d1
am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:28:20 -07:00
Dirk Dougherty
2054e56f01
am 775994e1: am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-11 10:28:16 -07:00
Dirk Dougherty
a7dc3494c1
am 2ecef59c: am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:28:11 -07:00
Jim Miller
6aa7287706
am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:28:06 -07:00
Keith Ito
1ef6a8b456
am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-11 10:26:24 -07:00
Nicolas Roard
ca07c17053
am 2f68be54: am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
2010-05-11 10:26:20 -07:00
Dianne Hackborn
a3d73a97b7
am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:26:15 -07:00
Dirk Dougherty
1b37884e7c
am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
2010-05-11 10:26:11 -07:00
Dirk Dougherty
8df7c60ee6
am 0ab047c7: am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:26:06 -07:00
Jim Miller
1dec60f893
am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:26:00 -07:00
Keith Ito
0ec06bc48e
am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken
* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
3a1fae098e
am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
bd516f83b3
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Dirk Dougherty
7f0364ebfc
am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
...
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken
* commit '02168c41c444e4f601a2809d6d948e4b051b3a3e':
Doc change: Final api diffs 7 -> 8.
2010-05-11 10:23:52 -07:00
