drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,536 Commits 1 Branch 0 Tags
Commit Graph

23536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Costin Manolache
3a17fbb757 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
1e438357f0 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
fb1097b3a6 resolved conflicts with ae4043ce1db1e2b30c23ec3d5b22fd382b92d961 merge 
Change-Id: I6618d37c717f592c9f016367395c2bce36215638
 2010-05-12 09:21:52 -07:00
Jean-Michel Trivi
9f7c4112ac 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
f355b34014 am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class. 2010-05-12 09:14:11 -07:00
Costin Manolache
b20842c75f am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-12 08:48:20 -07:00
Jean-Michel Trivi
4f9c9aa8e0 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
ae4043ce1d 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
11e26c2895 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
9813a3a250 am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class. 2010-05-12 08:47:42 -07:00
Costin Manolache
8579a4d726 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
fd5a747fc8 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
17246c6d90 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
9f35d39a05 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
b339013589 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
625de48897 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
0c73adb1de 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
6d405cfcfe 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
ea37d9b489 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
d8c33747af 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
e890bec743 Merge "Add Activity.isChangingConfiguration()." 2010-05-11 21:45:19 -07:00
Jason Sams
9685327c35 Merge "Convert renderscript from using ACC to LLVM for its compiler." 2010-05-11 14:04:42 -07:00
Jason Sams
4d3399337d Convert renderscript from using ACC to LLVM for its compiler. 
This will also require application to be updated to support
the new compiler and data passing models.

Change-Id: If078e3a5148af395ba1b936169a407d8c3ad727f
 2010-05-11 14:03:58 -07:00
James Dong
f4589e97c4 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
8b6ba6a272 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
723b72c2e9 am 6d111efe: am b5e74239: Output streamable MP4 file during MP4 file recording 2010-05-11 13:39:39 -07:00
James Dong
144bb4fa15 am 2cd841d4: Added initial validation on video/audio encoding parameters before/at start() 2010-05-11 13:37:11 -07:00
Jamie Gennis
c34a4fe3d1 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
6d111efe57 am b5e74239: Output streamable MP4 file during MP4 file recording 2010-05-11 13:36:54 -07:00
James Dong
2cd841d485 Added initial validation on video/audio encoding parameters before/at start() 
Change-Id: I1a40dd247202f70e3e5429d74533d349b88f1d54
 2010-05-11 13:10:02 -07:00
Jamie Gennis
25c2af99bf Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken 2010-05-11 12:25:31 -07:00
Leon Scroggins
810f5ccb99 Remove unnecessary calls to rebuildWebTextView. 
Bug 2674635

Change-Id: Ib33a5486b880868de7182c36a22f204383c58149
 2010-05-11 15:20:13 -04:00
Costin Manolache
e2055fe425 Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
3e90c76c12 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
fe08933450 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
Joe Malin
5e17347a27 Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride. 
Change-Id: I0da7ebb8040013611ba9269bc303e4b8197033aa
 2010-05-11 11:25:23 -07:00
Jean-Michel Trivi
46b3a1808a Update javadoc in android.media.AudioManager to not hide the 
registerAudioFocusListener() methods.

Change-Id: I8df37bd89df6f492aeb70fa636200552140578f9
 2010-05-11 11:22:54 -07:00
Keith Ito
6b385b6637 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
41ee307220 Merge "resolved conflicts for merge of bfd6805a to master" 2010-05-11 10:42:41 -07:00
Nicolas Roard
9863ba94f0 resolved conflicts for merge of bfd6805a to master 
Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45
 2010-05-11 10:40:11 -07:00
Joe Malin
ec9bbd6928 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
James Dong
b5e742397d Output streamable MP4 file during MP4 file recording 
When the reserved moov box space is not big enough,
fall back to non-streamable MP4 file.

Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
 2010-05-11 10:36:43 -07:00
Dianne Hackborn
834910f51f 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
e389ec59f9 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
7d3563238e 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
f5eaee96b0 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
a52c85dab1 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
bfd6805a82 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
217f2686a3 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
775994e12d am c5803869: am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-11 10:26:11 -07:00