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

52787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
113543c909 Merge "Enforce the rule that the timestamp from timelapse video source monotically increases" 2011-06-14 17:01:11 -07:00
James Dong
805bad6505 Merge "Update MediaPlayer and MediaRecorder javadoc" 2011-06-14 17:00:49 -07:00
James Dong
9ddb7888b4 Update MediaPlayer and MediaRecorder javadoc 
o Adding some description to the Looper requirement for receiving callbacks

Change-Id: I79e7014c521f2286e6c2ccea1097d7e7467eb9ee
 2011-06-14 16:38:08 -07:00
Fabrice Di Meglio
e460e6d718 Merge "Add View.getResolvedLayoutDirection()" 2011-06-14 16:23:06 -07:00
Fabrice Di Meglio
c0053223be Add View.getResolvedLayoutDirection() 
- update Callback2 interface
- update Gravity.getAbsoluteGravity() and Gravity.apply() to be more generic
 by changing "boolean isRtl" parameter to "int layoutDirection"
- fix BiDiTests for RTL FrameLayout

Change-Id: I97bb456c22d5fd3ecb34f08564ce4dbed37e7459
 2011-06-14 16:16:39 -07:00
Robert Ly
051d16ebec resolved conflicts for merge of 398d021b to master 
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
 2011-06-14 15:50:38 -07:00
Gloria Wang
2fd17c4544 Merge "To remove log spam in the Forward Lock DRM plugin. Fix for bug 4619159." 2011-06-14 15:35:11 -07:00
Robert Ly
36107a37a2 am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 
* commit '0b7d7f53a958132eb539fc81130423878c2db650':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
 2011-06-14 15:25:00 -07:00
Robert Ly
86f1ea099a am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit 'ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
  cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-14 15:22:51 -07:00
Robert Ly
f5d0eb92fb am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit 'ff46480e748555a923242af4238ec8d4822fd2ae':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-14 15:22:47 -07:00
Wink Saville
02f4e4f981 am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
  Enforce provision check for CSIM record only.
 2011-06-14 15:22:42 -07:00
Wink Saville
35831f198a am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE 
* commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
  Make APN re-connect delay configuable
 2011-06-14 15:22:38 -07:00
Wink Saville
3bcc33fdec am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 
* commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
  Revert "CDMALTE: Get roaming status based on SID/NID"
 2011-06-14 15:22:33 -07:00
Mathias Agopian
ba7336b4f5 am 9ee39758: (-s ours) am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit '9ee3975883cc4356d7b44f4e86d8c61589d2f42c':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 15:22:12 -07:00
Dianne Hackborn
386f67a152 am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 
* commit '8a73d211845671880b0d50fbb0c5caa065066c80':
  Update resources documentation with new qualifiers.
 2011-06-14 15:21:18 -07:00
Robert Ly
398d021b2f am 5d730c92: am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2 
* commit '5d730c9237fdf3252a9aa0c01c1653bae69f4f39':
  cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
 2011-06-14 15:13:21 -07:00
Robert Ly
5d730c9237 am 86ef7977: Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2 
* commit '86ef7977a95d6e1783f646d96992582d1dbf080a':
  cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a
 2011-06-14 15:10:07 -07:00
Robert Ly
86ef7977a9 Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2 2011-06-14 15:06:42 -07:00
Dianne Hackborn
65efcc5521 Merge "resolved conflicts for merge of 77fc8b80 to master" 2011-06-14 15:05:46 -07:00
Robert Ly
0b7d7f53a9 am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 
* commit 'b658dfb8f4363643b9426649ffc8e48be5c332f6':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
 2011-06-14 15:04:22 -07:00
Robert Ly
ae6dc0c5e2 am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit 'cbfab050756555a2f7d707522a9d044bcaa4e0c8':
  cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-14 15:02:28 -07:00
Robert Ly
ff46480e74 am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit '4cd4c82073a6066bb94cce089cd259d19969c0fd':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-14 15:02:25 -07:00
Robert Ly
b658dfb8f4 am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 
* commit 'cbd31aec9f4a7367d440bfb0c9683bd481461995':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
 2011-06-14 15:01:48 -07:00
Robert Ly
cbd31aec9f Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 2011-06-14 14:58:32 -07:00
Robert Ly
cbfab05075 am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit 'a91d6552913c02538b3f97e774e9771cfbef9dec':
  cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-14 14:58:11 -07:00
Robert Ly
4cd4c82073 am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit '9fa54704492234aed15ccdb29aae9261674811e3':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-14 14:58:08 -07:00
Robert Ly
a91d655291 Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 2011-06-14 14:56:00 -07:00
Robert Ly
9fa5470449 Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-14 14:55:35 -07:00
Gloria Wang
8b554f3503 To remove log spam in the Forward Lock DRM plugin. 
Fix for bug 4619159.

Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
 2011-06-14 14:50:10 -07:00
Wink Saville
5d47d203fb am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
  Enforce provision check for CSIM record only.
 2011-06-14 14:48:51 -07:00
Wink Saville
aad3c3cbb8 am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE 
* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
  Make APN re-connect delay configuable
 2011-06-14 14:47:07 -07:00
Wink Saville
46cd4a4bfe am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
  Revert "CDMALTE: Get roaming status based on SID/NID"
 2011-06-14 14:47:04 -07:00
Wink Saville
fbef26eb55 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
c2d17d3bea Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Wink Saville
82c1a5dea3 Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE 2011-06-14 14:44:12 -07:00
Jamie Gennis
6d99a3937d Merge changes I47f147f8,Id09915c9,Iabc6d27c 
* changes:
  SurfaceTexture: increase the test's Surface layer.
  SurfaceTexture: add some RGBA_8888 tests.
  SurfaceTextureClient: minor test refactoring.
 2011-06-14 14:15:11 -07:00
Kazuhiro Ondo
98e1e28f30 Enforce provision check for CSIM record only. 
Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
 2011-06-14 13:55:24 -07:00
Kazuhiro Ondo
c65d52b148 Make APN re-connect delay configuable 
Add configurability on hard coded timer.

Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
 2011-06-14 13:54:33 -07:00
Kazuhiro Ondo
23f646367d Revert "CDMALTE: Get roaming status based on SID/NID" 
This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
 2011-06-14 13:53:39 -07:00
Adam Powell
146a0103f4 Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException" 2011-06-14 13:47:45 -07:00
Adam Powell
e0adac0e72 Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException 
Fix a bug with split action bars and orientation changes.

Change-Id: If067803281c6ac23b51da5bf075fdf1be28afdc2
 2011-06-14 13:46:30 -07:00
Jamie Gennis
fba5fcf367 SurfaceTexture: increase the test's Surface layer. 
This change increases the Surface layer used for displaying the test
results so that the tests will be visible over other windows in the
system.

Change-Id: I47f147f8743ff2a39d57d551811668371202bd31
 2011-06-14 13:45:53 -07:00
Jamie Gennis
d23398d40c SurfaceTexture: add some RGBA_8888 tests. 
Change-Id: Id09915c98a00eca1209b7dab32039a06d260908e
 2011-06-14 13:45:53 -07:00
Jamie Gennis
3c7d846c26 SurfaceTextureClient: minor test refactoring. 
Change-Id: Iabc6d27ca35d30d896c6aef65c4f1b5a1eed47b8
 2011-06-14 13:45:52 -07:00
Doug Zongker
ff24bf439f Merge "deprecate RADIO constant, add getRadioVersion method" 2011-06-14 13:39:36 -07:00
Jamie Gennis
44ce622fc3 Merge "SurfaceTexture: add a format querying test." 2011-06-14 13:39:05 -07:00
Mathias Agopian
9ee3975883 am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit 'a9007fbdae6671f66535da4b9dad04b19aaf9186':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 13:30:34 -07:00
Mathias Agopian
a9007fbdae am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit '69b4587bfbb3e98f793959d9123340360fa233a2':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 13:26:38 -07:00
RoboErik
849d78973c Merge "Rename Calendar.java to CalendarContract.java" 2011-06-14 13:24:40 -07:00
Alex Sakhartchouk
9b309b99f7 Merge "Allocation copy functions." 2011-06-14 13:14:57 -07:00